diff options
author | Mike Travis <travis@sgi.com> | 2015-04-09 14:26:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-10 04:16:07 -0400 |
commit | 7a4e017041136de05527722b97e0c1f8702a5cbe (patch) | |
tree | b1f3311b666788e37e2b1bfcac0756d5f9ae8eb1 | |
parent | 4399c03c6780ed75fa26e09a7b3a175b3aac5760 (diff) |
x86/apic/uv: Update the APIC UV OEM check
Optimize the first "SGI" OEM check to return faster if the
system is not an SGI or UV system.
Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Hedi Berriche <hedi@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/20150409182628.952357922@asylum.americas.sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 8e9dcfd630e4..2a739a90010e 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c | |||
@@ -146,6 +146,9 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
146 | { | 146 | { |
147 | int pnodeid, is_uv1, is_uv2, is_uv3; | 147 | int pnodeid, is_uv1, is_uv2, is_uv3; |
148 | 148 | ||
149 | if (strncmp(oem_id, "SGI", 3) != 0) | ||
150 | return 0; | ||
151 | |||
149 | is_uv1 = !strcmp(oem_id, "SGI"); | 152 | is_uv1 = !strcmp(oem_id, "SGI"); |
150 | is_uv2 = !strcmp(oem_id, "SGI2"); | 153 | is_uv2 = !strcmp(oem_id, "SGI2"); |
151 | is_uv3 = !strncmp(oem_id, "SGI3", 4); /* there are varieties of UV3 */ | 154 | is_uv3 = !strncmp(oem_id, "SGI3", 4); /* there are varieties of UV3 */ |