x86, UV: ensure hub revision set for all ACPI modes.
Subsystems (2)
Ensure that UV hub revision is set for all ACPI modes.
Signed-off-by Russ Anderson <[email protected]>
---
Patch requires "Add function retrieving node controller revision number" patch.
arch/x86/kernel/apic/x2apic_uv_x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/x2apic_uv_x.c +4 -1
@@ -67,7 +67,10 @@ static int early_get_nodeid(void)static int __init uv_acpi_madt_oem_check (char *oem_id,char *oem_table_id) { +int nodeid; +if (!strcmp (oem_id,"SGI" )) { + nodeid =early_get_nodeid (); x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;if (!strcmp (oem_table_id,"UVL" )) uv_system_type =UV_LEGACY_APIC ;
@@ -75,7 +78,7 @@ static int __init uv_acpi_madt_oem_check uv_system_type =UV_X2APIC ; else if (!strcmp(oem_table_id, "UVH")) {__get_cpu_var (x2apic_extra_bits) = -early_get_nodeid () << (UV_APIC_PNODE_SHIFT -1 ); + nodeid << (UV_APIC_PNODE_SHIFT -1 ); uv_system_type =UV_NON_UNIQUE_APIC ;return 1 ; }
Signature · 2 lines
Russ Anderson, OS RAS/Partitioning Project Lead SGI - Silicon Graphics Inc [email protected]
[tip:x86/urgent] x86, uv: Ensure hub revision set for all ACPI modes.
Commit-ID: 1d2c867c941d635e53e8ad7bf37d060bb5b25ec5 Gitweb: http://git.kernel.org/tip/1d2c867c941d635e53e8ad7bf37d060bb5b25ec5 Author: Russ Anderson <[email protected]> AuthorDate: Fri, 15 Jan 2010 12:09:09 -0600 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 15 Jan 2010 11:09:04 -0800
x86, uv: Ensure hub revision set for all ACPI modes.
Ensure that UV hub revision is set for all ACPI modes.
Signed-off-by Russ Anderson <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +4 -1
@@ -66,7 +66,10 @@ static int early_get_nodeid(void)static int __init uv_acpi_madt_oem_check (char *oem_id,char *oem_table_id) { +int nodeid; +if (!strcmp (oem_id,"SGI" )) { + nodeid =early_get_nodeid (); x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;if (!strcmp (oem_table_id,"UVL" )) uv_system_type =UV_LEGACY_APIC ;
@@ -74,7 +77,7 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) uv_system_type =UV_X2APIC ; else if (!strcmp(oem_table_id, "UVH")) {__get_cpu_var (x2apic_extra_bits) = -early_get_nodeid () << (UV_APIC_PNODE_SHIFT -1 ); + nodeid << (UV_APIC_PNODE_SHIFT -1 ); uv_system_type =UV_NON_UNIQUE_APIC ;return 1 ; }