[071/156] mm/memory_hotplug: guard more declarations by CONFIG_MEMORY_HOTPLUG

Commit Message

Andrew Morton Oct. 16, 2020, 2:45 a.m. UTC

From: David Hildenbrand <[e-mail]>
Subject: mm/memory_hotplug: guard more declarations by CONFIG_MEMORY_HOTPLUG

We soon want to pass flags via a new type to add_memory() and friends. 
That revealed that we currently don't guard some declarations by
CONFIG_MEMORY_HOTPLUG.

While some definitions could be moved to different places, let's keep it
minimal for now and use CONFIG_MEMORY_HOTPLUG for all functions only
compiled with CONFIG_MEMORY_HOTPLUG.

Wrap sparse_decode_mem_map() into CONFIG_MEMORY_HOTPLUG, it's only called
from CONFIG_MEMORY_HOTPLUG code.

While at it, remove allow_online_pfn_range(), which is no longer around,
and mhp_notimplemented(), which is unused.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: David Hildenbrand <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Dan Williams <[e-mail]>
Cc: Pankaj Gupta <[e-mail]>
Cc: Baoquan He <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: Anton Blanchard <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Boris Ostrovsky <[e-mail]>
Cc: Christian Borntraeger <[e-mail]>
Cc: Dave Jiang <[e-mail]>
Cc: Eric Biederman <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: Haiyang Zhang <[e-mail]>
Cc: Heiko Carstens <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Jason Wang <[e-mail]>
Cc: Juergen Gross <[e-mail]>
Cc: Julien Grall <[e-mail]>
Cc: Kees Cook <[e-mail]>
Cc: "K. Y. Srinivasan" <[e-mail]>
Cc: Len Brown <[e-mail]>
Cc: Leonardo Bras <[e-mail]>
Cc: Libor Pechacek <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: "Michael S. Tsirkin" <[e-mail]>
Cc: Nathan Lynch <[e-mail]>
Cc: "Oliver O'Halloran" <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Pingfan Liu <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Roger Pau Monné <[e-mail]>
Cc: Stefano Stabellini <[e-mail]>
Cc: Stephen Hemminger <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Vasily Gorbik <[e-mail]>
Cc: Vishal Verma <[e-mail]>
Cc: Wei Liu <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 include/linux/memory_hotplug.h |   12 +++---------
 mm/sparse.c                    |    2 ++
 2 files changed, 5 insertions(+), 9 deletions(-)

Patch

--- a/include/linux/memory_hotplug.h~mm-memory_hotplug-guard-more-declarations-by-config_memory_hotplug
+++ a/include/linux/memory_hotplug.h
@@ -247,13 +247,6 @@  static inline void zone_span_writelock(s
 static inline void zone_span_writeunlock(struct zone *zone) {}
 static inline void zone_seqlock_init(struct zone *zone) {}
 
-static inline int mhp_notimplemented(const char *func)
-{
-	printk(KERN_WARNING "%s() called, with CONFIG_MEMORY_HOTPLUG disabled\n", func);
-	dump_stack();
-	return -ENOSYS;
-}
-
 static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
 {
 }
@@ -344,6 +337,7 @@  static inline void __remove_memory(int n
 extern void set_zone_contiguous(struct zone *zone);
 extern void clear_zone_contiguous(struct zone *zone);
 
+#ifdef CONFIG_MEMORY_HOTPLUG
 extern void __ref free_area_init_core_hotplug(int nid);
 extern int __add_memory(int nid, u64 start, u64 size);
 extern int add_memory(int nid, u64 start, u64 size);
@@ -364,8 +358,8 @@  extern void sparse_remove_section(struct
 		unsigned long map_offset, struct vmem_altmap *altmap);
 extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,
 					  unsigned long pnum);
-extern bool allow_online_pfn_range(int nid, unsigned long pfn, unsigned long nr_pages,
-		int online_type);
 extern struct zone *zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
 		unsigned long nr_pages);
+#endif /* CONFIG_MEMORY_HOTPLUG */
+
 #endif /* __LINUX_MEMORY_HOTPLUG_H */
--- a/mm/sparse.c~mm-memory_hotplug-guard-more-declarations-by-config_memory_hotplug
+++ a/mm/sparse.c
@@ -312,6 +312,7 @@  static unsigned long sparse_encode_mem_m
 	return coded_mem_map;
 }
 
+#ifdef CONFIG_MEMORY_HOTPLUG
 /*
  * Decode mem_map from the coded memmap
  */
@@ -321,6 +322,7 @@  struct page *sparse_decode_mem_map(unsig
 	coded_mem_map &= SECTION_MAP_MASK;
 	return ((struct page *)coded_mem_map) + section_nr_to_pfn(pnum);
 }
+#endif /* CONFIG_MEMORY_HOTPLUG */
 
 static void __meminit sparse_init_one_section(struct mem_section *ms,
 		unsigned long pnum, struct page *mem_map,