diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-23 17:47:12 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-25 10:39:19 +0300 |
| commit | 3152657f104ce9b0f80793c92a745d5e97b43812 (patch) | |
| tree | b720a75f328d16b999f02be8173e0db24ed699cb /arch/x86/kvm/vmx.c | |
| parent | b8c1b8ea7b219a7ba6d58d97bfdf1403b741f8d5 (diff) | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
| download | linux-3152657f104ce9b0f80793c92a745d5e97b43812.tar.xz | |
Merge branch 'linus' into x86/fpu
Resolve semantic conflict in arch/x86/kvm/cpuid.c with:
c447e76b4cab ("kvm/fpu: Enable eager restore kvm FPU for MPX")
By removing the FPU internal include files.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1c384bf856e5..e11dd59398f1 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -10184,6 +10184,7 @@ static struct kvm_x86_ops vmx_x86_ops = { .cache_reg = vmx_cache_reg, .get_rflags = vmx_get_rflags, .set_rflags = vmx_set_rflags, + .fpu_activate = vmx_fpu_activate, .fpu_deactivate = vmx_fpu_deactivate, .tlb_flush = vmx_flush_tlb, |