From 24fd25a40281bc4101c0bddbb870a70851de2443 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 2 May 2011 14:18:53 +0200
Subject: [PATCH] --- yaml --- r: 245705 b: refs/heads/master c:
 e6df595b37c7c033ef7400b4fdd382a2dc4f4131 h: refs/heads/master i:   245703:
 bf60bf0c1bf71bd7d7cfd3d381e2b40aa742f7f4 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/numa.h    | 1 +
 trunk/arch/x86/include/asm/numa_64.h | 4 ----
 trunk/arch/x86/mm/numa.c             | 1 +
 trunk/arch/x86/mm/numa_64.c          | 2 --
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 41844e50749b..8a1f7b786123 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daf4f480ae24270bac06db4293908d36b4834e21
+refs/heads/master: e6df595b37c7c033ef7400b4fdd382a2dc4f4131
diff --git a/trunk/arch/x86/include/asm/numa.h b/trunk/arch/x86/include/asm/numa.h
index 5982d418c358..c24306cd1504 100644
--- a/trunk/arch/x86/include/asm/numa.h
+++ b/trunk/arch/x86/include/asm/numa.h
@@ -19,6 +19,7 @@
  * numa_cpu_node().
  */
 extern s16 __apicid_to_node[MAX_LOCAL_APIC];
+extern nodemask_t numa_nodes_parsed __initdata;
 
 static inline void set_apicid_to_node(int apicid, s16 node)
 {
diff --git a/trunk/arch/x86/include/asm/numa_64.h b/trunk/arch/x86/include/asm/numa_64.h
index 794da6de6892..e84113f8fff3 100644
--- a/trunk/arch/x86/include/asm/numa_64.h
+++ b/trunk/arch/x86/include/asm/numa_64.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_X86_NUMA_64_H
 #define _ASM_X86_NUMA_64_H
 
-#include <linux/nodemask.h>
-
 #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
 
 extern int numa_off;
@@ -17,8 +15,6 @@ extern unsigned long numa_free_all_bootmem(void);
  */
 #define NODE_MIN_SIZE (4*1024*1024)
 
-extern nodemask_t numa_nodes_parsed __initdata;
-
 extern int __init numa_add_memblk(int nodeid, u64 start, u64 end);
 extern void __init numa_set_distance(int from, int to, int distance);
 
diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c
index e9005c4ea29a..cce174109ca9 100644
--- a/trunk/arch/x86/mm/numa.c
+++ b/trunk/arch/x86/mm/numa.c
@@ -6,6 +6,7 @@
 #include <asm/acpi.h>
 
 int __initdata numa_off;
+nodemask_t numa_nodes_parsed __initdata;
 
 static __init int numa_setup(char *opt)
 {
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 287ae798935f..70bd8221f928 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -26,8 +26,6 @@
 struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
 
-nodemask_t numa_nodes_parsed __initdata;
-
 static struct numa_meminfo numa_meminfo
 #ifndef CONFIG_MEMORY_HOTPLUG
 __initdata