summaryrefslogtreecommitdiff
path: root/include/asm-x86/kvm_x86_emulate.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-23 16:53:23 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-23 16:53:23 +1000
commitacf464817d5e7be9fb67aec4027dbee0ac9be17a (patch)
tree39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/asm-x86/kvm_x86_emulate.h
parent80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff)
parent8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff)
downloadlinux-next-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'include/asm-x86/kvm_x86_emulate.h')
-rw-r--r--include/asm-x86/kvm_x86_emulate.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/kvm_x86_emulate.h b/include/asm-x86/kvm_x86_emulate.h
index d6337f941c98..b877bbd2d3a7 100644
--- a/include/asm-x86/kvm_x86_emulate.h
+++ b/include/asm-x86/kvm_x86_emulate.h
@@ -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;
};