summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/apic/apic_flat_64.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-02-02 05:33:45 +0300
committerPaul Mundt <lethal@linux-sh.org>2010-02-02 05:33:45 +0300
commit9d3f1881abeae0494a27716b08fcf2d3264bb0fa (patch)
treef457dd2d35af29bc831b93865efa47229d0b9bee /arch/x86/kernel/apic/apic_flat_64.c
parentb6c58b1d987a5795086c5c2babd8c7367d2fdb8c (diff)
parentbc10e875d4aeaa93a0d418d8b4346b72f5067ea0 (diff)
downloadlinux-9d3f1881abeae0494a27716b08fcf2d3264bb0fa.tar.xz
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/x86/kernel/apic/apic_flat_64.c')
-rw-r--r--arch/x86/kernel/apic/apic_flat_64.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index eacbd2b31d27..e3c3d820c325 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -240,6 +240,11 @@ static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
printk(KERN_DEBUG "system APIC only can use physical flat");
return 1;
}
+
+ if (!strncmp(oem_id, "IBM", 3) && !strncmp(oem_table_id, "EXA", 3)) {
+ printk(KERN_DEBUG "IBM Summit detected, will use apic physical");
+ return 1;
+ }
#endif
return 0;