x86/paravirt: Use a single ops structure

[linux-2.6-block.git] / arch / x86 / kernel / paravirt_patch_64.c

diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
index 9cb98f7b07c9afb1a8118cbf84be125567481ea0..582e893728e862958b39861b8327bb5df563bd38 100644 (file)
--- a/arch/x86/kernel/paravirt_patch_64.c
+++ b/arch/x86/kernel/paravirt_patch_64.c
@@ -3,24 +3,24 @@
 #include <asm/asm-offsets.h>
 #include <linux/stringify.h>
 
-DEF_NATIVE(pv_irq_ops, irq_disable, "cli");
-DEF_NATIVE(pv_irq_ops, irq_enable, "sti");
-DEF_NATIVE(pv_irq_ops, restore_fl, "pushq %rdi; popfq");
-DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
-DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
-DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
-DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
-DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
+DEF_NATIVE(irq, irq_disable, "cli");
+DEF_NATIVE(irq, irq_enable, "sti");
+DEF_NATIVE(irq, restore_fl, "pushq %rdi; popfq");
+DEF_NATIVE(irq, save_fl, "pushfq; popq %rax");
+DEF_NATIVE(mmu, read_cr2, "movq %cr2, %rax");
+DEF_NATIVE(mmu, read_cr3, "movq %cr3, %rax");
+DEF_NATIVE(mmu, write_cr3, "movq %rdi, %cr3");
+DEF_NATIVE(cpu, wbinvd, "wbinvd");
 
-DEF_NATIVE(pv_cpu_ops, usergs_sysret64, "swapgs; sysretq");
-DEF_NATIVE(pv_cpu_ops, swapgs, "swapgs");
+DEF_NATIVE(cpu, usergs_sysret64, "swapgs; sysretq");
+DEF_NATIVE(cpu, swapgs, "swapgs");
 
 DEF_NATIVE(, mov32, "mov %edi, %eax");
 DEF_NATIVE(, mov64, "mov %rdi, %rax");
 
 #if defined(CONFIG_PARAVIRT_SPINLOCKS)
-DEF_NATIVE(pv_lock_ops, queued_spin_unlock, "movb $0, (%rdi)");
-DEF_NATIVE(pv_lock_ops, vcpu_is_preempted, "xor %eax, %eax");
+DEF_NATIVE(lock, queued_spin_unlock, "movb $0, (%rdi)");
+DEF_NATIVE(lock, vcpu_is_preempted, "xor %eax, %eax");
 #endif
 
 unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len)
@@ -38,8 +38,7 @@ unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len)
 extern bool pv_is_native_spin_unlock(void);
 extern bool pv_is_native_vcpu_is_preempted(void);
 
-unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
-                     unsigned long addr, unsigned len)
+unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)
 {
        const unsigned char *start, *end;
        unsigned ret;
@@ -50,29 +49,29 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
                        end = end_##ops##_##x;                  \
                        goto patch_site
        switch(type) {
-               PATCH_SITE(pv_irq_ops, restore_fl);
-               PATCH_SITE(pv_irq_ops, save_fl);
-               PATCH_SITE(pv_irq_ops, irq_enable);
-               PATCH_SITE(pv_irq_ops, irq_disable);
-               PATCH_SITE(pv_cpu_ops, usergs_sysret64);
-               PATCH_SITE(pv_cpu_ops, swapgs);
-               PATCH_SITE(pv_mmu_ops, read_cr2);
-               PATCH_SITE(pv_mmu_ops, read_cr3);
-               PATCH_SITE(pv_mmu_ops, write_cr3);
-               PATCH_SITE(pv_cpu_ops, wbinvd);
+               PATCH_SITE(irq, restore_fl);
+               PATCH_SITE(irq, save_fl);
+               PATCH_SITE(irq, irq_enable);
+               PATCH_SITE(irq, irq_disable);
+               PATCH_SITE(cpu, usergs_sysret64);
+               PATCH_SITE(cpu, swapgs);
+               PATCH_SITE(mmu, read_cr2);
+               PATCH_SITE(mmu, read_cr3);
+               PATCH_SITE(mmu, write_cr3);
+               PATCH_SITE(cpu, wbinvd);
 #if defined(CONFIG_PARAVIRT_SPINLOCKS)
-               case PARAVIRT_PATCH(pv_lock_ops.queued_spin_unlock):
+               case PARAVIRT_PATCH(lock.queued_spin_unlock):
                        if (pv_is_native_spin_unlock()) {
-                               start = start_pv_lock_ops_queued_spin_unlock;
-                               end   = end_pv_lock_ops_queued_spin_unlock;
+                               start = start_lock_queued_spin_unlock;
+                               end   = end_lock_queued_spin_unlock;
                                goto patch_site;
                        }
                        goto patch_default;
 
-               case PARAVIRT_PATCH(pv_lock_ops.vcpu_is_preempted):
+               case PARAVIRT_PATCH(lock.vcpu_is_preempted):
                        if (pv_is_native_vcpu_is_preempted()) {
-                               start = start_pv_lock_ops_vcpu_is_preempted;
-                               end   = end_pv_lock_ops_vcpu_is_preempted;
+                               start = start_lock_vcpu_is_preempted;
+                               end   = end_lock_vcpu_is_preempted;
                                goto patch_site;
                        }
                        goto patch_default;
@@ -80,7 +79,7 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
 
        default:
 patch_default: __maybe_unused
-               ret = paravirt_patch_default(type, clobbers, ibuf, addr, len);
+               ret = paravirt_patch_default(type, ibuf, addr, len);
                break;
 
 patch_site: