From 27113657f00910403a3f1384fd5c7b83a5ee6fed Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 30 Jan 2008 13:33:14 +0100
Subject: [PATCH] --- yaml --- r: 80299 b: refs/heads/master c:
 118c890961a2ca456947d72ebe0ce43de07907f0 h: refs/heads/master i:   80297:
 a24bb23704a29e565f1d08ae8a80dbb1d6d9ad65   80295:
 ad6fe34617f3a3f31dc6b972b8adc3d843acd769 v: v3

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

diff --git a/[refs] b/[refs]
index 3490ce136299..e74d20f0357e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 693e3c560317577a29c625d89f6745d5c7cfd918
+refs/heads/master: 118c890961a2ca456947d72ebe0ce43de07907f0
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index dca58fb39b08..7b03d2090c28 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -31,7 +31,7 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES];
 
 struct memnode memnode;
 
-u16 x86_cpu_to_node_map_init[NR_CPUS] __initdata = {
+u16 x86_cpu_to_node_map_init[NR_CPUS] = {
 	[0 ... NR_CPUS-1] = NUMA_NO_NODE
 };
 void *x86_cpu_to_node_map_early_ptr;
diff --git a/trunk/include/asm-x86/topology.h b/trunk/include/asm-x86/topology.h
index a89b46eb2526..2da1464ecbef 100644
--- a/trunk/include/asm-x86/topology.h
+++ b/trunk/include/asm-x86/topology.h
@@ -31,7 +31,7 @@
 
 /* Mappings between logical cpu number and node number */
 DECLARE_PER_CPU(u16, x86_cpu_to_node_map);
-extern u16 __initdata x86_cpu_to_node_map_init[];
+extern u16 x86_cpu_to_node_map_init[];
 extern void *x86_cpu_to_node_map_early_ptr;
 extern cpumask_t node_to_cpumask_map[];