x86: vsmp fix x86 vsmp fix is vsmp box cleanup

[sfrench/cifs-2.6.git] / arch / x86 / kernel / vsmp_64.c

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 13bd82453e4b756d5ac1e4c5f1bf966654946551..1e9a791dbe399cbf5038c5171f4216b882401266 100644 (file)
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -120,10 +120,8 @@ int is_vsmp_box(void)
                return vsmp;
 
        /* 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))
+       if (read_pci_config(0, 0x1f, 0, PCI_VENDOR_ID) ==
+            (PCI_VENDOR_ID_SCALEMP | (PCI_DEVICE_ID_SCALEMP_VSMP_CTL << 16)))
                vsmp = 1;
 
        return vsmp;