x86: remove never used nodenumer in pda

[sfrench/cifs-2.6.git] / arch / x86 / mm / numa_64.c

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 8ccfee10f5b52258526a2942a238b135f3d75743..18267a02e67ae442535e5d19d0e8c100b2b469cc 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -221,8 +221,7 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
                                 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
        if (bootmap == NULL)  {
                if (nodedata_phys < start || nodedata_phys >= end)
-                       free_bootmem((unsigned long)node_data[nodeid],
-                                    pgdat_size);
+                       free_bootmem(nodedata_phys, pgdat_size);
                node_data[nodeid] = NULL;
                return;
        }
@@ -549,8 +548,6 @@ void __cpuinit numa_set_node(int cpu, int node)
 {
        int *cpu_to_node_map = x86_cpu_to_node_map_early_ptr;
 
-       cpu_pda(cpu)->nodenumber = node;
-
        if(cpu_to_node_map)
                cpu_to_node_map[cpu] = node;
        else if(per_cpu_offset(cpu))