From 63f4a2af2c072d62ec95d93d02f8e238d6d51d16 Mon Sep 17 00:00:00 2001
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Tue, 27 Jun 2006 02:53:40 -0700
Subject: [PATCH] --- yaml --- r: 30733 b: refs/heads/master c:
 dd0932d9d4301bd58a4d5a634a3a8298c4fc5e24 h: refs/heads/master i:   30731:
 48af54385eb08c8afc66916706aa55c156a0cd0a v: v3

---
 [refs]                               |  2 +-
 trunk/arch/ia64/mm/discontig.c       | 16 ++++++++++++++--
 trunk/include/linux/memory_hotplug.h |  9 ++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 0d67b39d780e..52bb0e9ec7ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7049027c6f0098eb6b23b8f6ca65a905541faf81
+refs/heads/master: dd0932d9d4301bd58a4d5a634a3a8298c4fc5e24
diff --git a/trunk/arch/ia64/mm/discontig.c b/trunk/arch/ia64/mm/discontig.c
index 9153465d7fcc..525b082eb661 100644
--- a/trunk/arch/ia64/mm/discontig.c
+++ b/trunk/arch/ia64/mm/discontig.c
@@ -100,7 +100,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
  * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been
  * called yet.  Note that node 0 will also count all non-existent cpus.
  */
-static int __init early_nr_cpus_node(int node)
+static int __meminit early_nr_cpus_node(int node)
 {
 	int cpu, n = 0;
 
@@ -115,7 +115,7 @@ static int __init early_nr_cpus_node(int node)
  * compute_pernodesize - compute size of pernode data
  * @node: the node id.
  */
-static unsigned long __init compute_pernodesize(int node)
+static unsigned long __meminit compute_pernodesize(int node)
 {
 	unsigned long pernodesize = 0, cpus;
 
@@ -792,6 +792,18 @@ void __init paging_init(void)
 	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
 }
 
+pg_data_t *arch_alloc_nodedata(int nid)
+{
+	unsigned long size = compute_pernodesize(nid);
+
+	return kzalloc(size, GFP_KERNEL);
+}
+
+void arch_free_nodedata(pg_data_t *pgdat)
+{
+	kfree(pgdat);
+}
+
 void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
 {
 	pgdat_list[update_node] = update_pgdat;
diff --git a/trunk/include/linux/memory_hotplug.h b/trunk/include/linux/memory_hotplug.h
index 9b6260007e5e..218501cfaeb9 100644
--- a/trunk/include/linux/memory_hotplug.h
+++ b/trunk/include/linux/memory_hotplug.h
@@ -84,13 +84,8 @@ static inline int memory_add_physaddr_to_nid(u64 start)
  * Now, arch_free_nodedata() is just defined for error path of node_hot_add.
  *
  */
-static inline pg_data_t *arch_alloc_nodedata(int nid)
-{
-	return NULL;
-}
-static inline void arch_free_nodedata(pg_data_t *pgdat)
-{
-}
+extern pg_data_t *arch_alloc_nodedata(int nid);
+extern void arch_free_nodedata(pg_data_t *pgdat);
 extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat);
 
 #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */