From dcd3a95d8f54652977bebecbacde27d053830e4a Mon Sep 17 00:00:00 2001
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Tue, 27 Jun 2006 02:53:33 -0700
Subject: [PATCH] --- yaml --- r: 30724 b: refs/heads/master c:
 10ad400b49aca15ecf83b0fde7e35e4064b15c85 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/ia64/Kconfig              |  4 ++++
 trunk/include/linux/memory_hotplug.h | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 152bf3fbf8b5..c6aabff8d15e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 306d6cbe86e2e6603ac3162e1294d5c75cfdeca6
+refs/heads/master: 10ad400b49aca15ecf83b0fde7e35e4064b15c85
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 18318749884b..a56df7bf022d 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -374,6 +374,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
 	def_bool y
 	depends on NEED_MULTIPLE_NODES
 
+config HAVE_ARCH_NODEDATA_EXTENSION
+	def_bool y
+	depends on NUMA
+
 config IA32_SUPPORT
 	bool "Support for Linux/x86 binaries"
 	help
diff --git a/trunk/include/linux/memory_hotplug.h b/trunk/include/linux/memory_hotplug.h
index c6fd2c0323fc..569b1f6c27d1 100644
--- a/trunk/include/linux/memory_hotplug.h
+++ b/trunk/include/linux/memory_hotplug.h
@@ -91,6 +91,9 @@ static inline pg_data_t *arch_alloc_nodedata(int nid)
 static inline void arch_free_nodedata(pg_data_t *pgdat)
 {
 }
+static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
+{
+}
 
 #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
 
@@ -114,6 +117,12 @@ static inline void arch_free_nodedata(pg_data_t *pgdat)
  */
 #define generic_free_nodedata(pgdat)	kfree(pgdat)
 
+extern pg_data_t *node_data[];
+static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
+{
+	node_data[nid] = pgdat;
+}
+
 #else /* !CONFIG_NUMA */
 
 /* never called */
@@ -125,6 +134,9 @@ static inline pg_data_t *generic_alloc_nodedata(int nid)
 static inline void generic_free_nodedata(pg_data_t *pgdat)
 {
 }
+static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
+{
+}
 #endif /* CONFIG_NUMA */
 #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */