Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

sh updates for v6.11

Browse Source 
- sh: push-switch: Add missing MODULE_DESCRIPTION() macro
 - sh: config: Drop CONFIG_MEMORY_{HOTPLUG,HOTREMOVE}
 - sh: Drop support for memory hotplug and memory hotremove
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEYv+KdYTgKVaVRgAGdCY7N/W1+RMFAmafg5kACgkQdCY7N/W1
 +ROVFA/6AglkX0dSSMD6tVgOgTn4LYD09WlVy+y8/huUNL/BZgnlgk45uE+Sbfzr
 yUdnh5kKQ4pfZ29APRneEHHlClz2dtVGlUavcWLUwoZD3kJxDK/zDcdabW0x4EhJ
 BFjgdzCx+eQKgcci9T/1BOPp9GMJoaOEsX6gcyWavbvJNpo78GVT1+88XKR6a5Jv
 0yeS0kF3BPbvMXuhxwgu1KHmMwk7BoxW5e9jelYXBfO6ZBQsrE0ZGxnOHo1aFxLo
 uah8wxzEJnuzql3h9YV3ENbCv1uyAb+ZP/g925g9/h87hmuJcgjkkdm2DQyet1kO
 WsSeuDcB7hUJWOWmtmframNJ0dtch+ygECL7HflkECDWbrkvwCu7ngwothxaBfKR
 /APMbiVY87r/Dxmcc3ldU/C6Ax1vL2hptJEaHmvnl4jRwP5/s1Iwcm4PLvEFVlDQ
 s/82TfztgfXFdcjzlH8cls86/VctTlwMExv3Dbgha9IbK8aSS9Fzl+gzoXh6H2wW
 TstpLTe5EiH1KzgOsPoBNUaipziVG64qdjCMA0zQ36/ns432Mv2bbirmy90WiZrD
 T/aTEDtRpeWgfx6Ekte/5pTq8tYlfYN1xQMBoOeAknr4X+ilM88XwmGMw5Vnk39u
 eCJSGA5c5ErsmEVT8doL7qi8+EBhygvfWvgQ1WXYoRxJf21QUgw=
 =ImWg
 -----END PGP SIGNATURE-----

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 7ec58a2b94 ("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
This commit is contained in:
Linus Torvalds 2024-07-23 11:57:52 -07:00
commit e9680017b2
7 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/Kconfig
View File

@ -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

2
arch/sh/configs/apsh4ad0a_defconfig
View File

@ -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

2
arch/sh/configs/sdk7786_defconfig
View File

@ -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

2
arch/sh/configs/shx3_defconfig
View File

@ -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

1
arch/sh/drivers/push-switch.c
View File

@ -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");

4
arch/sh/mm/Kconfig
View File

@ -144,10 +144,6 @@ config ARCH_SPARSEMEM_DEFAULT
config ARCH_SELECT_MEMORY_MODEL
def_bool y
config ARCH_MEMORY_PROBE
def_bool y
depends on MEMORY_HOTPLUG
config IOREMAP_FIXED
def_bool y
depends on X2TLB

28
arch/sh/mm/init.c
View File

@ -395,31 +395,3 @@ void __init mem_init(void)
mem_init_done = 1;
}
#ifdef CONFIG_MEMORY_HOTPLUG
int arch_add_memory(int nid, u64 start, u64 size,
struct mhp_params *params)
{
unsigned long start_pfn = PFN_DOWN(start);
unsigned long nr_pages = size >> PAGE_SHIFT;
int ret;
if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot))
return -EINVAL;
/* We only have ZONE_NORMAL, so this is easy.. */
ret = __add_pages(nid, start_pfn, nr_pages, params);
if (unlikely(ret))
printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
return ret;
}
void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
{
unsigned long start_pfn = PFN_DOWN(start);
unsigned long nr_pages = size >> PAGE_SHIFT;
__remove_pages(start_pfn, nr_pages, altmap);
}
#endif /* CONFIG_MEMORY_HOTPLUG */