x86: move k8 related declarations

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / numa_64.c

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 6da235522269e856fc000807888db8e345891a90..2d8fdc05f415428c9ec8b0a1681a470f624371ae 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -17,6 +17,7 @@
 #include <asm/dma.h>
 #include <asm/numa.h>
 #include <asm/acpi.h>
+#include <asm/k8.h>
 
 #ifndef Dprintk
 #define Dprintk(x...)
@@ -166,7 +167,7 @@ early_node_mem(int nodeid, unsigned long start, unsigned long end,
                return __va(mem);
        ptr = __alloc_bootmem_nopanic(size,
                                SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS));
-       if (ptr == 0) {
+       if (ptr == NULL) {
                printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
                        size, nodeid);
                return NULL;
@@ -261,7 +262,7 @@ void __init numa_init_array(void)
           We round robin the existing nodes. */
        rr = first_node(node_online_map);
        for (i = 0; i < NR_CPUS; i++) {
-               if (cpu_to_node[i] != NUMA_NO_NODE)
+               if (cpu_to_node(i) != NUMA_NO_NODE)
                        continue;
                numa_set_node(i, rr);
                rr = next_node(rr, node_online_map);
@@ -543,7 +544,7 @@ __cpuinit void numa_add_cpu(int cpu)
 void __cpuinit numa_set_node(int cpu, int node)
 {
        cpu_pda(cpu)->nodenumber = node;
-       cpu_to_node[cpu] = node;
+       cpu_to_node(cpu) = node;
 }
 
 unsigned long __init numa_free_all_bootmem(void) 
@@ -612,7 +613,7 @@ void __init init_cpu_to_node(void)
 {
        int i;
        for (i = 0; i < NR_CPUS; i++) {
-               u8 apicid = x86_cpu_to_apicid[i];
+               u8 apicid = x86_cpu_to_apicid_init[i];
                if (apicid == BAD_APICID)
                        continue;
                if (apicid_to_node[apicid] == NUMA_NO_NODE)