x86: vSMP: use pvops only if platform has the capability to support it

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>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 4a790a5f61b7..13bd82453e4b 100644
--- 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);