[POWERPC] 83xx: MPC832x RDB - remove spidev stub, use mmc_spi

[linux-2.6] / arch / x86 / mm / srat_64.c

diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index acdf03e191468b32ad84d16cd66ee47c106f0191..ea85172fc0cc6c33fd20ec49981411ea9b73d031 100644 (file)
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -218,7 +218,7 @@ static inline int save_add_info(void) {return 0;}
 /*
  * Update nodes_add and decide if to include add are in the zone.
  * Both SPARSE and RESERVE need nodes_add infomation.
- * This code supports one contigious hot add area per node.
+ * This code supports one contiguous hot add area per node.
  */
 static int reserve_hotadd(int node, unsigned long start, unsigned long end)
 {
@@ -431,9 +431,9 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
                        setup_node_bootmem(i, nodes[i].start, nodes[i].end);
 
        for (i = 0; i < NR_CPUS; i++) {
-               if (cpu_to_node[i] == NUMA_NO_NODE)
+               if (cpu_to_node(i) == NUMA_NO_NODE)
                        continue;
-               if (!node_isset(cpu_to_node[i], node_possible_map))
+               if (!node_isset(cpu_to_node(i), node_possible_map))
                        numa_set_node(i, NUMA_NO_NODE);
        }
        numa_init_array();