diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
index 1fe209d..e08e749 100644
--- a/drivers/kvm/x86.c
+++ b/drivers/kvm/x86.c
@@ -194,7 +194,7 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)
 			break;
 		}
 	}
-	if (entry && (entry->edx & (1 << 20)) && !(efer & EFER_NX)) {
+	if (entry) {
 		entry->edx &= ~(1 << 20);
 		printk(KERN_INFO "kvm: guest NX capability removed\n");
 	}