| Message ID | 20240518115808.8888-2-osalvador@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Drop support for memory-hotplug and memory-hotremove on superH | expand |
On Sat, 2024-05-18 at 13:58 +0200, Oscar Salvador wrote: > Since commit 7ec58a2b941ed889("mm/memory_hotplug: restrict > CONFIG_MEMORY_HOTPLUG to 64 bit"), we only support memory-hotplug on > 64bits platforms, but currently superH can only run on 32bit, so > remove the code that handles memory-hotplug and memory-hotremove as > that cannot work. > > Signed-off-by: Oscar Salvador <osalvador@suse.de> > --- > arch/sh/mm/init.c | 28 ---------------------------- > 1 file changed, 28 deletions(-) > > diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c > index bf1b54055316..d1fe90b2f5ff 100644 > --- a/arch/sh/mm/init.c > +++ b/arch/sh/mm/init.c > @@ -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 */ Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Will pick this up later today. Adrian
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index bf1b54055316..d1fe90b2f5ff 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -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 */
Since commit 7ec58a2b941ed889("mm/memory_hotplug: restrict CONFIG_MEMORY_HOTPLUG to 64 bit"), we only support memory-hotplug on 64bits platforms, but currently superH can only run on 32bit, so remove the code that handles memory-hotplug and memory-hotremove as that cannot work. Signed-off-by: Oscar Salvador <osalvador@suse.de> --- arch/sh/mm/init.c | 28 ---------------------------- 1 file changed, 28 deletions(-)