diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-06-04 02:23:51 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-04 02:23:51 +0300 |
| commit | a8a50fce60e86f82e442bf84b8af20750b3d6105 (patch) | |
| tree | 974c04f9f4f10275a8a9435113ea5b307d172bb6 /arch/x86/kvm/svm.c | |
| parent | 9b5edbf7a462b7c846e9d4675b9b72b7a4e84de9 (diff) | |
| parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
| download | linux-a8a50fce60e86f82e442bf84b8af20750b3d6105.tar.xz | |
Merge tag 'v4.1-rc6' into drm-next
Linux 4.1-rc6
backmerge 4.1-rc6 as some of the later pull reqs are based on newer bases
and I'd prefer to do the fixup myself.
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ce741b8650f6..9afa233b5482 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4381,6 +4381,7 @@ static struct kvm_x86_ops svm_x86_ops = { .cache_reg = svm_cache_reg, .get_rflags = svm_get_rflags, .set_rflags = svm_set_rflags, + .fpu_activate = svm_fpu_activate, .fpu_deactivate = svm_fpu_deactivate, .tlb_flush = svm_flush_tlb, |