Commit 742adaa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of https://github.com/openrisc/linux 

Pull OpenRISC updates from Stafford Horne:
 "I picked up one series from Chen Miao, our Google Summer of Code
  contributor, which adds OpenRISC support for static keys"

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: Add jump label support
  openrisc: Regenerate defconfigs.
  openrisc: Add R_OR1K_32_PCREL relocation type module support
  openrisc: Add text patching API support
parents 21fbefc5 8c30b001

Documentation/features/core/jump-labels/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    |  microblaze: | TODO |

    |        mips: |  ok  |

    |       nios2: | TODO |

    |    openrisc: | TODO |

    |    openrisc: |  ok  |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: |  ok  |

arch/openrisc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ config OPENRISC 
	select GENERIC_PCI_IOMAP

	select GENERIC_IOREMAP

	select GENERIC_CPU_DEVICES

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_PCI

	select HAVE_UID16

	select HAVE_PAGE_SIZE_8KB

arch/openrisc/configs/or1ksim_defconfig

+7 −12
Original line number Diff line number Diff line
@@ -3,26 +3,23 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_GZIP is not set

CONFIG_EXPERT=y

# CONFIG_KALLSYMS is not set

# CONFIG_EPOLL is not set

# CONFIG_TIMERFD is not set

# CONFIG_EVENTFD is not set

# CONFIG_AIO is not set

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

CONFIG_MODULES=y

# CONFIG_BLOCK is not set

# CONFIG_KALLSYMS is not set

CONFIG_BUILTIN_DTB_NAME="or1ksim"

CONFIG_HZ_100=y

CONFIG_JUMP_LABEL=y

CONFIG_MODULES=y

# CONFIG_BLOCK is not set

CONFIG_SLUB_TINY=y

# CONFIG_COMPAT_BRK is not set

# CONFIG_VM_EVENT_COUNTERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

CONFIG_TCP_CONG_ADVANCED=y

# CONFIG_TCP_CONG_BIC is not set
@@ -35,7 +32,6 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

CONFIG_PROC_DEVICETREE=y

CONFIG_NETDEVICES=y

CONFIG_ETHOC=y

CONFIG_MICREL_PHY=y
@@ -53,4 +49,3 @@ CONFIG_SERIAL_OF_PLATFORM=y 
# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

CONFIG_NFS_FS=y
 
# CONFIG_ENABLE_MUST_CHECK is not set

arch/openrisc/configs/virt_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CONFIG_NR_CPUS=8 
CONFIG_SMP=y

CONFIG_HZ_100=y

# CONFIG_OPENRISC_NO_SPR_SR_DSX is not set

CONFIG_JUMP_LABEL=y

# CONFIG_COMPAT_BRK is not set

CONFIG_NET=y

CONFIG_PACKET=y
@@ -55,7 +56,6 @@ CONFIG_DRM=y 
# CONFIG_DRM_FBDEV_EMULATION is not set

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FB=y

CONFIG_FIRMWARE_EDID=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

arch/openrisc/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -9,4 +9,3 @@ generic-y += spinlock.h 
generic-y += qrwlock_types.h

generic-y += qrwlock.h

generic-y += user.h
 
generic-y += text-patching.h