tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 7ec58a2b941e ("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

Linus Torvalds e9680017 f4887900

+1 -40
-2
arch/sh/Kconfig
··· 3 3 def_bool y 4 4 select ARCH_32BIT_OFF_T 5 5 select ARCH_HAS_CPU_CACHE_ALIASING 6 - select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU 7 - select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU 8 6 select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) 9 7 select ARCH_HAS_BINFMT_FLAT if !MMU 10 8 select ARCH_HAS_CPU_FINALIZE_INIT
-2
arch/sh/configs/apsh4ad0a_defconfig
··· 24 24 CONFIG_CPU_SUBTYPE_SH7786=y 25 25 CONFIG_MEMORY_SIZE=0x10000000 26 26 CONFIG_HUGETLB_PAGE_SIZE_1MB=y 27 - CONFIG_MEMORY_HOTPLUG=y 28 - CONFIG_MEMORY_HOTREMOVE=y 29 27 CONFIG_KSM=y 30 28 CONFIG_SH_STORE_QUEUES=y 31 29 CONFIG_SH_APSH4AD0A=y
-2
arch/sh/configs/sdk7786_defconfig
··· 43 43 CONFIG_PMB=y 44 44 CONFIG_NUMA=y 45 45 CONFIG_HUGETLB_PAGE_SIZE_64MB=y 46 - CONFIG_MEMORY_HOTPLUG=y 47 - CONFIG_MEMORY_HOTREMOVE=y 48 46 CONFIG_KSM=y 49 47 CONFIG_SH_STORE_QUEUES=y 50 48 CONFIG_SPECULATIVE_EXECUTION=y
-2
arch/sh/configs/shx3_defconfig
··· 31 31 CONFIG_MEMORY_START=0x0c000000 32 32 CONFIG_NUMA=y 33 33 CONFIG_PAGE_SIZE_64KB=y 34 - CONFIG_MEMORY_HOTPLUG=y 35 - CONFIG_MEMORY_HOTREMOVE=y 36 34 CONFIG_SH_STORE_QUEUES=y 37 35 CONFIG_SH_X3PROTO=y 38 36 CONFIG_NO_HZ=y
+1
arch/sh/drivers/push-switch.c
··· 131 131 132 132 MODULE_VERSION(DRV_VERSION); 133 133 MODULE_AUTHOR("Paul Mundt"); 134 + MODULE_DESCRIPTION("Generic push-switch framework"); 134 135 MODULE_LICENSE("GPL v2");
-4
arch/sh/mm/Kconfig
··· 144 144 config ARCH_SELECT_MEMORY_MODEL 145 145 def_bool y 146 146 147 - config ARCH_MEMORY_PROBE 148 - def_bool y 149 - depends on MEMORY_HOTPLUG 150 - 151 147 config IOREMAP_FIXED 152 148 def_bool y 153 149 depends on X2TLB
-28
arch/sh/mm/init.c
··· 395 395 396 396 mem_init_done = 1; 397 397 } 398 - 399 - #ifdef CONFIG_MEMORY_HOTPLUG 400 - int arch_add_memory(int nid, u64 start, u64 size, 401 - struct mhp_params *params) 402 - { 403 - unsigned long start_pfn = PFN_DOWN(start); 404 - unsigned long nr_pages = size >> PAGE_SHIFT; 405 - int ret; 406 - 407 - if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)) 408 - return -EINVAL; 409 - 410 - /* We only have ZONE_NORMAL, so this is easy.. */ 411 - ret = __add_pages(nid, start_pfn, nr_pages, params); 412 - if (unlikely(ret)) 413 - printk("%s: Failed, __add_pages() == %d\n", __func__, ret); 414 - 415 - return ret; 416 - } 417 - 418 - void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) 419 - { 420 - unsigned long start_pfn = PFN_DOWN(start); 421 - unsigned long nr_pages = size >> PAGE_SHIFT; 422 - 423 - __remove_pages(start_pfn, nr_pages, altmap); 424 - } 425 - #endif /* CONFIG_MEMORY_HOTPLUG */