Commit e9680017 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux 

Pull sh updates from John Paul Adrian Glaubitz:
 "This is rather small this time and contains just three changes.

  The first change by Oscar Salvador drops support for memory hotplug
  and hotremove for sh as the kernel stopped supporting it on 32-bit
  platforms since 7ec58a2b ("mm/memory_hotplug: restrict
  CONFIG_MEMORY_HOTPLUG to 64 bit").

  That then results in a follow-up change to update all affected board
  config files.

  The third change comes from Jeff Johnson which adds the missing
  MODULE_DESCRIPTION() macro to the push-switch driver"

* tag 'sh-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
  sh: push-switch: Add missing MODULE_DESCRIPTION() macro
  sh: config: Drop CONFIG_MEMORY_{HOTPLUG,HOTREMOVE}
  sh: Drop support for memory hotplug and memory hotremove
parents f4887900 8fe76a1c

arch/sh/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ config SUPERH 
	def_bool y

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_CPU_CACHE_ALIASING

	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU

	select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)

	select ARCH_HAS_BINFMT_FLAT if !MMU

	select ARCH_HAS_CPU_FINALIZE_INIT

arch/sh/configs/apsh4ad0a_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y 
CONFIG_CPU_SUBTYPE_SH7786=y

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_HUGETLB_PAGE_SIZE_1MB=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_SH_STORE_QUEUES=y

CONFIG_SH_APSH4AD0A=y

arch/sh/configs/sdk7786_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ CONFIG_MEMORY_SIZE=0x20000000 
CONFIG_PMB=y

CONFIG_NUMA=y

CONFIG_HUGETLB_PAGE_SIZE_64MB=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_SH_STORE_QUEUES=y

CONFIG_SPECULATIVE_EXECUTION=y

arch/sh/configs/shx3_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ CONFIG_CPU_SUBTYPE_SHX3=y 
CONFIG_MEMORY_START=0x0c000000

CONFIG_NUMA=y

CONFIG_PAGE_SIZE_64KB=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_SH_STORE_QUEUES=y

CONFIG_SH_X3PROTO=y

CONFIG_NO_HZ=y

arch/sh/drivers/push-switch.c

+1 −0
Original line number Diff line number Diff line
@@ -131,4 +131,5 @@ module_exit(switch_exit); 


MODULE_VERSION(DRV_VERSION);

MODULE_AUTHOR("Paul Mundt");

MODULE_DESCRIPTION("Generic push-switch framework");

MODULE_LICENSE("GPL v2");