x86: vSMP: use pvops only if platform has the capability to support it
authorRavikiran G Thirumalai <kiran@scalex86.org>
Thu, 20 Mar 2008 07:43:16 +0000 (00:43 -0700)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:08 +0000 (17:41 +0200)
Re-arrange set_vsmp_pv_ops so that pv_ops are set only if
the platform has capability to support paravirtualized irq ops

Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/vsmp_64.c

index 4a790a5..13bd824 100644 (file)
@@ -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);