x86: use BOOTMEM_EXCLUSIVE on 32-bit

[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 4a790a5f61b71135b958335c778c00397a929ada..ba8c0b75ab0ae8c4fbbaba61c4afd6637cf4bd4a 100644 (file)
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -78,12 +78,6 @@ static void __init set_vsmp_pv_ops(void)
        void *address;
        unsigned int cap, ctl, cfg;
 
-       pv_irq_ops.irq_disable = vsmp_irq_disable;
-       pv_irq_ops.irq_enable  = vsmp_irq_enable;
-       pv_irq_ops.save_fl  = vsmp_save_fl;
-       pv_irq_ops.restore_fl  = vsmp_restore_fl;
-       pv_init_ops.patch = vsmp_patch;
-
        /* set vSMP magic bits to indicate vSMP capable kernel */
        cfg = read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0);
        address = early_ioremap(cfg, 8);
@@ -92,7 +86,13 @@ static void __init set_vsmp_pv_ops(void)
        printk(KERN_INFO "vSMP CTL: capabilities:0x%08x  control:0x%08x\n",
               cap, ctl);
        if (cap & ctl & (1 << 4)) {
-               /* Turn on vSMP IRQ fastpath handling (see system.h) */
+               /* Setup irq ops and turn on vSMP  IRQ fastpath handling */
+               pv_irq_ops.irq_disable = vsmp_irq_disable;
+               pv_irq_ops.irq_enable  = vsmp_irq_enable;
+               pv_irq_ops.save_fl  = vsmp_save_fl;
+               pv_irq_ops.restore_fl  = vsmp_restore_fl;
+               pv_init_ops.patch = vsmp_patch;
+
                ctl &= ~(1 << 4);
                writel(ctl, address + 4);
                ctl = readl(address + 4);
@@ -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 void __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;