OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
27e6fb5
)
Merge commit '33b458d276bb' into kvm-next
author
Paolo Bonzini
<pbonzini@redhat.com>
Mon, 30 Jun 2014 14:51:07 +0000
(16:51 +0200)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Mon, 30 Jun 2014 14:51:07 +0000
(16:51 +0200)
Fix bad x86 regression introduced during merge window.
arch/x86/kvm/svm.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/svm.c
b/arch/x86/kvm/svm.c
index
ec8366c
..
b5e994a
100644
(file)
--- a/
arch/x86/kvm/svm.c
+++ b/
arch/x86/kvm/svm.c
@@
-1462,6
+1462,7
@@
static void svm_get_segment(struct kvm_vcpu *vcpu,
*/
if (var->unusable)
var->db = 0;
+ var->dpl = to_svm(vcpu)->vmcb->save.cpl;
break;
}
}