diff --git a/[refs] b/[refs]
index 65e2b94a4a8b..5159bf6a0ccf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccf82085ee32c9b171183d8042e8a6e2776ec628
+refs/heads/master: 04d1dd20f64f2b41baf5c01f57c574ca942ab4eb
diff --git a/trunk/include/asm-x86/topology.h b/trunk/include/asm-x86/topology.h
index 8af05a93f097..dada89e5b152 100644
--- a/trunk/include/asm-x86/topology.h
+++ b/trunk/include/asm-x86/topology.h
@@ -32,15 +32,15 @@
 /* Mappings between logical cpu number and node number */
 #ifdef CONFIG_X86_32
 extern int cpu_to_node_map[];
-
 #else
-DECLARE_PER_CPU(int, x86_cpu_to_node_map);
-extern int x86_cpu_to_node_map_init[];
-extern void *x86_cpu_to_node_map_early_ptr;
 /* Returns the number of the current Node. */
 #define numa_node_id()		(early_cpu_to_node(raw_smp_processor_id()))
 #endif
 
+DECLARE_PER_CPU(int, x86_cpu_to_node_map);
+extern int x86_cpu_to_node_map_init[];
+extern void *x86_cpu_to_node_map_early_ptr;
+
 extern cpumask_t node_to_cpumask_map[];
 
 #define NUMA_NO_NODE	(-1)