x86, UV: Fix initialization of max_pnode
Subsystems (2)
PATCH 1/1 x86, UV: Fix initialization of max_pnode
Fix calculation of "max_pnode" for systems where the the highest blade has neither cpus or memory. (And, yes, although rare this does occur).
Signed-off-by Jack Steiner <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +3 -3
@@ -698,9 +698,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++; } }
@@ -738,7 +740,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); }/* Add blade/pnode info for nodes without cpus */
@@ -750,7 +751,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);
Commit-ID: 36ac4b987bea9a95217e1af552252f275ca7fc44 Gitweb: http://git.kernel.org/tip/36ac4b987bea9a95217e1af552252f275ca7fc44 Author: Jack Steiner <[email protected]> AuthorDate: Fri, 10 Sep 2010 10:08:08 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 10 Sep 2010 17:15:49 +0200
x86, UV: Fix initialization of max_pnode
Fix calculation of "max_pnode" for systems where the the highest blade has neither cpus or memory. (And, yes, although rare this does occur).
Signed-off-by Jack Steiner <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +3 -3
@@ -698,9 +698,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++; } }
@@ -738,7 +740,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); }/* Add blade/pnode info for nodes without cpus */
@@ -750,7 +751,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);