x86: use bitmap library for pin_programmed

[linux-2.6] / arch / x86 / kernel / vsmp_64.c

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 13bd82453e4b756d5ac1e4c5f1bf966654946551..caf2a26f5cfd1b712c346a835b3755b842a466b7 100644 (file)
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -108,27 +108,34 @@ static void __init set_vsmp_pv_ops(void)
 #endif
 
 #ifdef CONFIG_PCI
-static int vsmp = -1;
+static int is_vsmp = -1;
 
-int is_vsmp_box(void)
+static void __init detect_vsmp_box(void)
 {
-       if (vsmp != -1)
-               return vsmp;
+       is_vsmp = 0;
 
-       vsmp = 0;
        if (!early_pci_allowed())
-               return vsmp;
+               return;
 
-       /* 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))
-               vsmp = 1;
+       /* Check if we are running on a ScaleMP vSMPowered box */
+       if (read_pci_config(0, 0x1f, 0, PCI_VENDOR_ID) ==
+            (PCI_VENDOR_ID_SCALEMP | (PCI_DEVICE_ID_SCALEMP_VSMP_CTL << 16)))
+               is_vsmp = 1;
+}
 
-       return vsmp;
+int is_vsmp_box(void)
+{
+       if (is_vsmp != -1)
+               return is_vsmp;
+       else {
+               WARN_ON_ONCE(1);
+               return 0;
+       }
 }
 #else
+static int __init detect_vsmp_box(void)
+{
+}
 int is_vsmp_box(void)
 {
        return 0;
@@ -137,6 +144,7 @@ int is_vsmp_box(void)
 
 void __init vsmp_init(void)
 {
+       detect_vsmp_box();
        if (!is_vsmp_box())
                return;