[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100115180908.GB7757@sgi.com>
Date: Fri, 15 Jan 2010 12:09:09 -0600
From: Russ Anderson <rja@....com>
To: Ingo Molnar <mingo@...e.hu>
Cc: Jack Steiner <steiner@....com>, "H. Peter Anvin" <hpa@...or.com>,
tglx@...utronix.de, linux-kernel@...r.kernel.org
Subject: [BUGFIX] 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 <rja@....com>
---
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(-)
Index: linux/arch/x86/kernel/apic/x2apic_uv_x.c
===================================================================
--- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2010-01-15 10:47:54.000000000 -0600
+++ linux/arch/x86/kernel/apic/x2apic_uv_x.c 2010-01-15 10:48:44.000000000 -0600
@@ -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;
}
--
Russ Anderson, OS RAS/Partitioning Project Lead
SGI - Silicon Graphics Inc rja@....com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists