From 661fb542a503ea1f35b701736736d4d24dce6a0f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sat, 25 Mar 2006 16:31:46 +0100
Subject: [PATCH] --- yaml --- r: 23843 b: refs/heads/master c:
 dcf36bfa5de6d4e37878d4c98b6986fee4eb8b4c h: refs/heads/master i:   23841:
 97791b50801f71995c2cef35ebf0175fde672cff   23839:
 5ccca28fb4388716f36adf554ed8a3376cc8c07e v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86_64/mm/numa.c       | 6 ++----
 trunk/include/asm-x86_64/mmzone.h | 9 +++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5904ef3129ad..145cdf6196c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40caa884650fc6931cf55918dbf7496c49b3ddf8
+refs/heads/master: dcf36bfa5de6d4e37878d4c98b6986fee4eb8b4c
diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c
index 07471a3eb190..63c72641b737 100644
--- a/trunk/arch/x86_64/mm/numa.c
+++ b/trunk/arch/x86_64/mm/numa.c
@@ -25,8 +25,7 @@
 struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 bootmem_data_t plat_node_bdata[MAX_NUMNODES];
 
-int memnode_shift;
-u8  memnodemap[NODEMAPSIZE];
+struct memnode memnode;
 
 unsigned char cpu_to_node[NR_CPUS] __read_mostly = {
 	[0 ... NR_CPUS-1] = NUMA_NO_NODE
@@ -367,8 +366,7 @@ void __init init_cpu_to_node(void)
 
 EXPORT_SYMBOL(cpu_to_node);
 EXPORT_SYMBOL(node_to_cpumask);
-EXPORT_SYMBOL(memnode_shift);
-EXPORT_SYMBOL(memnodemap);
+EXPORT_SYMBOL(memnode);
 EXPORT_SYMBOL(node_data);
 
 #ifdef CONFIG_DISCONTIGMEM
diff --git a/trunk/include/asm-x86_64/mmzone.h b/trunk/include/asm-x86_64/mmzone.h
index 972c9359f7d7..937f99b26883 100644
--- a/trunk/include/asm-x86_64/mmzone.h
+++ b/trunk/include/asm-x86_64/mmzone.h
@@ -15,8 +15,13 @@
 #define NODEMAPSIZE 0xfff
 
 /* Simple perfect hash to map physical addresses to node numbers */
-extern int memnode_shift; 
-extern u8  memnodemap[NODEMAPSIZE]; 
+struct memnode {
+	int shift;
+	u8 map[NODEMAPSIZE];
+} ____cacheline_aligned;
+extern struct memnode memnode;
+#define memnode_shift memnode.shift
+#define memnodemap memnode.map
 
 extern struct pglist_data *node_data[];