x86/paravirt: Move the pv_irq_ops under the PARAVIRT_XXL umbrella

[linux-block.git] / arch / x86 / kernel / asm-offsets.c

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 01de31db300d3cbf17de120b3a89011f170f65d3..28e7572ff74d51f358fcf04b39b66affa6bc7023 100644 (file)
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -66,13 +66,12 @@ void common(void) {
 
 #ifdef CONFIG_PARAVIRT
        BLANK();
-       OFFSET(PARAVIRT_PATCH_pv_cpu_ops, paravirt_patch_template, pv_cpu_ops);
-       OFFSET(PARAVIRT_PATCH_pv_irq_ops, paravirt_patch_template, pv_irq_ops);
-       OFFSET(PV_IRQ_irq_disable, pv_irq_ops, irq_disable);
-       OFFSET(PV_IRQ_irq_enable, pv_irq_ops, irq_enable);
-       OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
-       OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
-       OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
+#ifdef CONFIG_PARAVIRT_XXL
+       OFFSET(PV_IRQ_irq_disable, paravirt_patch_template, irq.irq_disable);
+       OFFSET(PV_IRQ_irq_enable, paravirt_patch_template, irq.irq_enable);
+       OFFSET(PV_CPU_iret, paravirt_patch_template, cpu.iret);
+#endif
+       OFFSET(PV_MMU_read_cr2, paravirt_patch_template, mmu.read_cr2);
 #endif
 
 #ifdef CONFIG_XEN