From a532db37c0f7f7c0b41b29b9ecabe8cc3622e6cc Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Wed, 4 Jun 2008 08:30:54 +1000
Subject: [PATCH] --- yaml --- r: 97871 b: refs/heads/master c:
 0d5799449f0f373ca12681d86c941ae464146a37 h: refs/heads/master i:   97869:
 0b35b7a5cab0d9400058154d3cc968d099366d48   97867:
 4439bac403b5a870bbc22e25a4b83f4294008c93   97863:
 7a5929c62df0827803ef43e9bd1833d32c019a8b   97855:
 2a1867117f769a600570bd179e5096c127361442 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/powerpc/mm/mem.c          |  3 +--
 trunk/include/linux/memory_hotplug.h | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 3ebe5a073520..1005f2b48f59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420b5eeaee5b877829c4f0a514a5ad21448596af
+refs/heads/master: 0d5799449f0f373ca12681d86c941ae464146a37
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index f67e118116fa..51f82d83bf14 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -151,6 +151,7 @@ int remove_memory(u64 start, u64 size)
 	return ret;
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */
+#endif /* CONFIG_MEMORY_HOTPLUG */
 
 /*
  * walk_memory_resource() needs to make sure there is no holes in a given
@@ -184,8 +185,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,
 }
 EXPORT_SYMBOL_GPL(walk_memory_resource);
 
-#endif /* CONFIG_MEMORY_HOTPLUG */
-
 void show_mem(void)
 {
 	unsigned long total = 0, reserved = 0;
diff --git a/trunk/include/linux/memory_hotplug.h b/trunk/include/linux/memory_hotplug.h
index 73e358612eaf..ea9f5ad9ec8e 100644
--- a/trunk/include/linux/memory_hotplug.h
+++ b/trunk/include/linux/memory_hotplug.h
@@ -77,14 +77,6 @@ extern int __add_pages(struct zone *zone, unsigned long start_pfn,
 extern int __remove_pages(struct zone *zone, unsigned long start_pfn,
 	unsigned long nr_pages);
 
-/*
- * Walk through all memory which is registered as resource.
- * arg is (start_pfn, nr_pages, private_arg_pointer)
- */
-extern int walk_memory_resource(unsigned long start_pfn,
-			unsigned long nr_pages, void *arg,
-			int (*func)(unsigned long, unsigned long, void *));
-
 #ifdef CONFIG_NUMA
 extern int memory_add_physaddr_to_nid(u64 start);
 #else
@@ -199,6 +191,14 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
 
 #endif /* ! CONFIG_MEMORY_HOTPLUG */
 
+/*
+ * Walk through all memory which is registered as resource.
+ * arg is (start_pfn, nr_pages, private_arg_pointer)
+ */
+extern int walk_memory_resource(unsigned long start_pfn,
+			unsigned long nr_pages, void *arg,
+			int (*func)(unsigned long, unsigned long, void *));
+
 extern int add_memory(int nid, u64 start, u64 size);
 extern int arch_add_memory(int nid, u64 start, u64 size);
 extern int remove_memory(u64 start, u64 size);