From: Wei Yang Date: Fri, 28 Dec 2018 08:38:13 +0000 (-0800) Subject: include/linux/memory_hotplug.h: remove duplicate declaration of offline_pages() X-Git-Tag: v5.15~7310^2~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0614ce9776b037b6a08a9adcbfcc382c0053b178;p=platform%2Fkernel%2Flinux-starfive.git include/linux/memory_hotplug.h: remove duplicate declaration of offline_pages() offline_pages() is already declared in this file. Just remove the duplicated one. Link: http://lkml.kernel.org/r/20181205031357.24769-1-richard.weiyang@gmail.com Signed-off-by: Wei Yang Reviewed-by: David Hildenbrand Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 8ed6e09..07da5c6 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -331,7 +331,6 @@ extern int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, bool want_memblock); extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages, struct vmem_altmap *altmap); -extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern bool is_memblock_offlined(struct memory_block *mem); extern int sparse_add_one_section(int nid, unsigned long start_pfn, struct vmem_altmap *altmap);