diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 20:04:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 20:04:55 -0400 |
| commit | 3e0b8df79ddb8955d2cce5e858972a9cfe763384 (patch) | |
| tree | dbe35b7403c462aaaabb4176c02229feb991be1c /arch/x86/pci | |
| parent | 805120795947008612ef64618bba8a6aa30cf88b (diff) | |
| parent | ae90c232be376bd8a283f3b6fb37cb5bd2635d67 (diff) | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Correct UV2 BAU destination timeout
x86, UV: Correct failed topology memory leak
x86, UV: Remove cpumask_t from the stack
x86, UV: Rename hubmask to pnmask
x86, UV: Correct reset_with_ipi()
x86, UV: Allow for non-consecutive sockets
x86, UV: Inline header file functions
x86, UV: Fix smp_processor_id() use in a preemptable region
x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
x86, UV: Clean up uv_mmrs.h
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 750c346ef50a..301e325992f6 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
| @@ -519,7 +519,8 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg, | |||
| 519 | if (cfg->address < 0xFFFFFFFF) | 519 | if (cfg->address < 0xFFFFFFFF) |
| 520 | return 0; | 520 | return 0; |
| 521 | 521 | ||
| 522 | if (!strcmp(mcfg->header.oem_id, "SGI")) | 522 | if (!strcmp(mcfg->header.oem_id, "SGI") || |
| 523 | !strcmp(mcfg->header.oem_id, "SGI2")) | ||
| 523 | return 0; | 524 | return 0; |
| 524 | 525 | ||
| 525 | if (mcfg->header.revision >= 1) { | 526 | if (mcfg->header.revision >= 1) { |