diff options
| author | Mike Travis <travis@sgi.com> | 2013-02-11 14:45:10 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-11 20:17:44 -0500 |
| commit | 526018bc5eccfe3177780f03d2aaba0efee40720 (patch) | |
| tree | 47fca44fe2dc8a0366db5b0f73f28cd95b121c76 /arch/x86/pci | |
| parent | 60fe7be34d96c596d82e37cc0392e7bb546989d1 (diff) | |
x86, uv, uv3: Update ACPI Check to include SGI UV3
Add UV3 to exclusion list. Instead of adding every new series of
SGI UV systems, just check oem_id to have a prefix of "SGI".
Signed-off-by: Mike Travis <travis@sgi.com>
Link: http://lkml.kernel.org/r/20130211194508.457937455@gulag1.americas.sgi.com
Acked-by: Russ Anderson <rja@sgi.com>
Reviewed-by: Dimitri Sivanich <sivanich@sgi.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index fb29968a7cd5..082e88129712 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
| @@ -548,8 +548,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg, | |||
| 548 | if (cfg->address < 0xFFFFFFFF) | 548 | if (cfg->address < 0xFFFFFFFF) |
| 549 | return 0; | 549 | return 0; |
| 550 | 550 | ||
| 551 | if (!strcmp(mcfg->header.oem_id, "SGI") || | 551 | if (!strncmp(mcfg->header.oem_id, "SGI", 3)) |
| 552 | !strcmp(mcfg->header.oem_id, "SGI2")) | ||
| 553 | return 0; | 552 | return 0; |
| 554 | 553 | ||
| 555 | if (mcfg->header.revision >= 1) { | 554 | if (mcfg->header.revision >= 1) { |