diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-06-24 08:57:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-24 08:57:20 +0200 |
| commit | 1bc3cd4dfa9f2f5385ee15de2301d25e51cf43f0 (patch) | |
| tree | cd38acbcaeea1520a598cf8978002a07c2a5993b /arch/x86/include | |
| parent | sched/rt: Move RT related code from sched/core.c to sched/rt.c (diff) | |
| parent | Merge tag 'powerpc-4.12-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (diff) | |
| download | linux-dev-1bc3cd4dfa9f2f5385ee15de2301d25e51cf43f0.tar.xz linux-dev-1bc3cd4dfa9f2f5385ee15de2301d25e51cf43f0.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/kvm_emulate.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index 055962615779..722d0e568863 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -296,6 +296,7 @@ struct x86_emulate_ctxt { bool perm_ok; /* do not check permissions if true */ bool ud; /* inject an #UD if host doesn't support insn */ + bool tf; /* TF value before instruction (after for syscall/sysret) */ bool have_exception; struct x86_exception exception; |