From 0b8f4f5e0b227751707caa2c1f04dcbd9ade0dd9 Mon Sep 17 00:00:00 2001
From: Badari Pulavarty <pbadari@us.ibm.com>
Date: Tue, 5 Feb 2008 00:10:18 -0800
Subject: [PATCH] --- yaml --- r: 84879 b: refs/heads/master c:
 a99824f327c748b2753f4fa570eb1fefcd6a9c4d h: refs/heads/master i:   84877:
 9cf610e37d2359c5fc843dcf4bfb57cb7d5ff786   84875:
 08268e5fe13bac6f8125d3b5263978850b34d3fa   84871:
 b1e9b9ea65c5cea47e3410bac5d81097c449e3dc   84863:
 cec10b843952997f3f16546ee47f5c50a9bced2c v: v3

---
 [refs]                      |  2 +-
 trunk/arch/powerpc/Kconfig  |  3 +++
 trunk/arch/powerpc/mm/mem.c | 17 +++++++++++++++++
 trunk/kernel/resource.c     |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bdff268b8dcb..f25e569f8876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1482471d19e77d794012dbacaa65c44ceaae37bb
+refs/heads/master: a99824f327c748b2753f4fa570eb1fefcd6a9c4d
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index d55063c021d5..26b963c33c88 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -272,6 +272,9 @@ config HOTPLUG_CPU
 config ARCH_ENABLE_MEMORY_HOTPLUG
 	def_bool y
 
+config ARCH_HAS_WALK_MEMORY
+	def_bool y
+
 config ARCH_ENABLE_MEMORY_HOTREMOVE
 	def_bool y
 
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index f0a1fd268b7a..be5c506779a7 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -145,6 +145,23 @@ int remove_memory(u64 start, u64 size)
 	return ret;
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */
+
+/*
+ * walk_memory_resource() needs to make sure there is no holes in a given
+ * memory range. On PPC64, since this range comes from /sysfs, the range
+ * is guaranteed to be valid, non-overlapping and can not contain any
+ * holes. By the time we get here (memory add or remove), /proc/device-tree
+ * is updated and correct. Only reason we need to check against device-tree
+ * would be if we allow user-land to specify a memory range through a
+ * system call/ioctl etc. instead of doing offline/online through /sysfs.
+ */
+int
+walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg,
+			int (*func)(unsigned long, unsigned long, void *))
+{
+	return  (*func)(start_pfn, nr_pages, arg);
+}
+
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
 void show_mem(void)
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
index 2eb553d9b517..82aea814d409 100644
--- a/trunk/kernel/resource.c
+++ b/trunk/kernel/resource.c
@@ -228,7 +228,7 @@ int release_resource(struct resource *old)
 
 EXPORT_SYMBOL(release_resource);
 
-#ifdef CONFIG_MEMORY_HOTPLUG
+#if defined(CONFIG_MEMORY_HOTPLUG) && !defined(CONFIG_ARCH_HAS_WALK_MEMORY)
 /*
  * Finds the lowest memory reosurce exists within [res->start.res->end)
  * the caller must specify res->start, res->end, res->flags.