Pull bugzilla-3774 into release branch

[linux-2.6-omap-h63xx.git] / arch / x86_64 / kernel / vsmp.c

diff --git a/arch/x86_64/kernel/vsmp.c b/arch/x86_64/kernel/vsmp.c
index 92f70c74965f8cbb29e44bf9e36e41b3b9b6dc89..414caf0c5f9ae96b67bafea7589b532fa821b361 100644 (file)
--- a/arch/x86_64/kernel/vsmp.c
+++ b/arch/x86_64/kernel/vsmp.c
@@ -14,12 +14,16 @@
 #include <linux/pci_ids.h>
 #include <linux/pci_regs.h>
 #include <asm/pci-direct.h>
+#include <asm/io.h>
 
 static int __init vsmp_init(void)
 {
        void *address;
        unsigned int cap, ctl;
 
+       if (!early_pci_allowed())
+               return 0;
+
        /* Check if we are running on a ScaleMP vSMP box */
        if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) != PCI_VENDOR_ID_SCALEMP) ||
            (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != PCI_DEVICE_ID_SCALEMP_VSMP_CTL))