diff --git a/[refs] b/[refs]
index 3adf7edc7349..fd446f466179 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f8e45a288991ff24951b83fe83cf3eb011bbaed
+refs/heads/master: afc54659b1023a5232a55b7b8919294c693ff8ab
diff --git a/trunk/include/asm-x86/numa_64.h b/trunk/include/asm-x86/numa_64.h
index 933ff11ece15..0cc5c97a7fc9 100644
--- a/trunk/include/asm-x86/numa_64.h
+++ b/trunk/include/asm-x86/numa_64.h
@@ -2,6 +2,7 @@
 #define _ASM_X8664_NUMA_H 1
 
 #include <linux/nodemask.h>
+#include <asm/apicdef.h>
 
 struct bootnode {
 	u64 start,end; 
@@ -19,7 +20,7 @@ extern void numa_set_node(int cpu, int node);
 extern void srat_reserve_add_area(int nodeid);
 extern int hotadd_percent;
 
-extern unsigned char apicid_to_node[256];
+extern unsigned char apicid_to_node[MAX_LOCAL_APIC];
 #ifdef CONFIG_NUMA
 extern void __init init_cpu_to_node(void);