diff options
author | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
---|---|---|
committer | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /arch/x86/include/asm/kvm_emulate.h | |
parent | x86/Kconfig: Deprecate DISCONTIGMEM support for 32-bit x86 (diff) | |
parent | Merge tag 'ceph-for-5.1-rc7' of git://github.com/ceph/ceph-client (diff) | |
download | kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.gz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.xz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.zip |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/kvm_emulate.h')
-rw-r--r-- | arch/x86/include/asm/kvm_emulate.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index 93c4bf598fb0..feab24cac610 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -226,7 +226,9 @@ struct x86_emulate_ops { unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt); void (*set_hflags)(struct x86_emulate_ctxt *ctxt, unsigned hflags); - int (*pre_leave_smm)(struct x86_emulate_ctxt *ctxt, u64 smbase); + int (*pre_leave_smm)(struct x86_emulate_ctxt *ctxt, + const char *smstate); + void (*post_leave_smm)(struct x86_emulate_ctxt *ctxt); }; |