diff --git a/[refs] b/[refs] index 02b8f59f0544..afde446a5fdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edcafe3c5a06f46407c3f60145a36f269e56ff7f +refs/heads/master: f9a48e6a18c210c4bf34769fa05ede250575c6a1 diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index 1de2ad7a004d..1ad34d185da9 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/arch/x86/kvm/x86.c @@ -428,6 +428,8 @@ static bool pdptrs_changed(struct kvm_vcpu *vcpu) void kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) { + cr0 |= X86_CR0_ET; + if (cr0 & CR0_RESERVED_BITS) { printk(KERN_DEBUG "set_cr0: 0x%lx #GP, reserved bits 0x%lx\n", cr0, kvm_read_cr0(vcpu));