ia64: convert to generic helpers for IPI function calls

[linux-2.6-omap-h63xx.git] / include / asm-x86 / kvm_x86_emulate.h

diff --git a/include/asm-x86/kvm_x86_emulate.h b/include/asm-x86/kvm_x86_emulate.h
index 7db91b9bdcd4c59d950485497fef97b4dc53c43b..b877bbd2d3a7064aa80fc27dbcfe2a45fc5e5246 100644 (file)
--- a/include/asm-x86/kvm_x86_emulate.h
+++ b/include/asm-x86/kvm_x86_emulate.h
@@ -68,10 +68,10 @@ struct x86_emulate_ops {
         *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
         *  @bytes: [IN ] Number of bytes to read from memory.
         */
-       int (*read_emulated) (unsigned long addr,
-                             void *val,
-                             unsigned int bytes,
-                             struct kvm_vcpu *vcpu);
+       int (*read_emulated)(unsigned long addr,
+                            void *val,
+                            unsigned int bytes,
+                            struct kvm_vcpu *vcpu);
 
        /*
         * write_emulated: Read bytes from emulated/special memory area.
@@ -80,10 +80,10 @@ struct x86_emulate_ops {
         *                required).
         *  @bytes: [IN ] Number of bytes to write to memory.
         */
-       int (*write_emulated) (unsigned long addr,
-                              const void *val,
-                              unsigned int bytes,
-                              struct kvm_vcpu *vcpu);
+       int (*write_emulated)(unsigned long addr,
+                             const void *val,
+                             unsigned int bytes,
+                             struct kvm_vcpu *vcpu);
 
        /*
         * cmpxchg_emulated: Emulate an atomic (LOCKed) CMPXCHG operation on an
@@ -93,11 +93,11 @@ struct x86_emulate_ops {
         *  @new:   [IN ] Value to write to @addr.
         *  @bytes: [IN ] Number of bytes to access using CMPXCHG.
         */
-       int (*cmpxchg_emulated) (unsigned long addr,
-                                const void *old,
-                                const void *new,
-                                unsigned int bytes,
-                                struct kvm_vcpu *vcpu);
+       int (*cmpxchg_emulated)(unsigned long addr,
+                               const void *old,
+                               const void *new,
+                               unsigned int bytes,
+                               struct kvm_vcpu *vcpu);
 
 };
 
@@ -135,6 +135,7 @@ struct decode_cache {
        u8 modrm_rm;
        u8 use_modrm_ea;
        unsigned long modrm_ea;
+       void *modrm_ptr;
        unsigned long modrm_val;
        struct fetch_cache fetch;
 };
@@ -143,7 +144,7 @@ struct x86_emulate_ctxt {
        /* Register state before/after emulation. */
        struct kvm_vcpu *vcpu;
 
-       /* Linear faulting address (if emulating a page-faulting instruction). */
+       /* Linear faulting address (if emulating a page-faulting instruction) */
        unsigned long eflags;
 
        /* Emulated execution mode, represented by an X86EMUL_MODE value. */