1 files changed, 7 insertions, 6 deletions

diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index bef58b4982db..2cc4a90e2cb3 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -680,10 +680,11 @@ static inline int __init activate_vmi(void)
         para_fill(pv_mmu_ops.write_cr2, SetCR2);
         para_fill(pv_mmu_ops.write_cr3, SetCR3);
         para_fill(pv_cpu_ops.write_cr4, SetCR4);
-        para_fill(pv_irq_ops.save_fl, GetInterruptMask);
-        para_fill(pv_irq_ops.restore_fl, SetInterruptMask);
-        para_fill(pv_irq_ops.irq_disable, DisableInterrupts);
-        para_fill(pv_irq_ops.irq_enable, EnableInterrupts);
+
+        para_fill(pv_irq_ops.save_fl.func, GetInterruptMask);
+        para_fill(pv_irq_ops.restore_fl.func, SetInterruptMask);
+        para_fill(pv_irq_ops.irq_disable.func, DisableInterrupts);
+        para_fill(pv_irq_ops.irq_enable.func, EnableInterrupts);
 
         para_fill(pv_cpu_ops.wbinvd, WBINVD);
         para_fill(pv_cpu_ops.read_tsc, RDTSC);
@@ -797,8 +798,8 @@ static inline int __init activate_vmi(void)
 #endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
-       para_fill(apic_ops->read, APICRead);
-       para_fill(apic_ops->write, APICWrite);
+       para_fill(apic->read, APICRead);
+       para_fill(apic->write, APICWrite);
 #endif
 
         /*