diff --git a/[refs] b/[refs] index 3cd92d8d9b15..6881659382f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 394b6e5944865a558fe25f0c5903b34c434038ee +refs/heads/master: 310bc76c2b6829cd280def4927b7ccf8b8c795df diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index f0fc8d9e71e6..093cea36194b 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/drivers/kvm/kvm_main.c @@ -558,6 +558,7 @@ void set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) && !load_pdptrs(vcpu, vcpu->cr3)) { printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n"); inject_gp(vcpu); + return; } if (cr4 & X86_CR4_VMXE) {