aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-05-05 17:08:49 +0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-05-18 15:03:27 -0700
commita02ce953a14d6a8aab721b129b3c8ff4981a76e6 (patch)
tree6131f29db636ad779c27201b96056d8be64fc0e7 /arch/x86
parent8f6bce3c4f48bd79b57d6ac9f337f5aabee43ea7 (diff)
downloadkernel_samsung_smdk4412-a02ce953a14d6a8aab721b129b3c8ff4981a76e6.zip
kernel_samsung_smdk4412-a02ce953a14d6a8aab721b129b3c8ff4981a76e6.tar.gz
kernel_samsung_smdk4412-a02ce953a14d6a8aab721b129b3c8ff4981a76e6.tar.bz2
x86/PCI: make ACPI MCFG reserved error messages ACPI specific
Both ACPI and SFI firmwares will have MCFG space, but the error message isn't valid on SFI, so don't print the message in that case. Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/mmconfig-shared.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 39b9ebe..a918553 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -483,16 +483,17 @@ static void __init pci_mmcfg_reject_broken(int early)
list_for_each_entry(cfg, &pci_mmcfg_list, list) {
int valid = 0;
- if (!early && !acpi_disabled)
+ if (!early && !acpi_disabled) {
valid = is_mmconf_reserved(is_acpi_reserved, cfg, 0);
- if (valid)
- continue;
-
- if (!early)
- printk(KERN_ERR FW_BUG PREFIX
- "MMCONFIG at %pR not reserved in "
- "ACPI motherboard resources\n", &cfg->res);
+ if (valid)
+ continue;
+ else
+ printk(KERN_ERR FW_BUG PREFIX
+ "MMCONFIG at %pR not reserved in "
+ "ACPI motherboard resources\n",
+ &cfg->res);
+ }
/* Don't try to do this check unless configuration
type 1 is available. how about type 2 ?*/