--- arch/x86/kernel/apic/x2apic_uv_x.c

+++ arch/x86/kernel/apic/x2apic_uv_x.c

@@ -595,9 +595,11 @@ void __init uv_system_init(void)

for (j = 0; j < 64; j++) {

if (!test_bit(j, &present))

continue;

- uv_blade_info[blade].pnode = (i * 64 + j);

+ pnode = (i * 64 + j);

+ uv_blade_info[blade].pnode = pnode;

uv_blade_info[blade].nr_possible_cpus = 0;

uv_blade_info[blade].nr_online_cpus = 0;

+ max_pnode = max(pnode, max_pnode);

blade++;

}

}

@@ -635,10 +637,6 @@ void __init uv_system_init(void)

uv_cpu_hub_info(cpu)->scir.offset = uv_scir_offset(apicid);

uv_node_to_blade[nid] = blade;

uv_cpu_to_blade[cpu] = blade;

- max_pnode = max(pnode, max_pnode);

-

- printk(KERN_DEBUG "UV: cpu %d, apicid 0x%x, pnode %d, nid %d, lcpu %d, blade %d\n",

- cpu, apicid, pnode, nid, lcpu, blade);

}

/* Add blade/pnode info for nodes without cpus */

@@ -650,7 +648,6 @@ void __init uv_system_init(void)

pnode = (paddr >> m_val) & pnode_mask;

blade = boot_pnode_to_blade(pnode);

uv_node_to_blade[nid] = blade;

- max_pnode = max(pnode, max_pnode);

}

map_gru_high(max_pnode);