git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
drivers
/
kvm
/
kvm_main.c
diff --git
a/drivers/kvm/kvm_main.c
b/drivers/kvm/kvm_main.c
index
07ae280
..
47c10b8
100644
(file)
--- a/
drivers/kvm/kvm_main.c
+++ b/
drivers/kvm/kvm_main.c
@@
-1188,8
+1188,7
@@
int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address)
int emulate_clts(struct kvm_vcpu *vcpu)
{
- vcpu->cr0 &= ~X86_CR0_TS;
- kvm_x86_ops->set_cr0(vcpu, vcpu->cr0);
+ kvm_x86_ops->set_cr0(vcpu, vcpu->cr0 & ~X86_CR0_TS);
return X86EMUL_CONTINUE;
}