---

yaml --- r: 62877 b: refs/heads/master c: 4c981b4 h: refs/heads/master i: 62875: 1c0357b v: v3
git-mirror · Jul 25, 2007 · fd1bcff · fd1bcff
1 parent 7ce0340
commit fd1bcff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cfa4b0a43286b1da3afa4f5f99d52e65a8f30fc
+refs/heads/master: 4c981b43d7ec18818754bf85b829865abd0ce340
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
@@ -2432,9 +2432,9 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)
 			break;
 		}
 	}
-	if (entry && (entry->edx & EFER_NX) && !(efer & EFER_NX)) {
+	if (entry && (entry->edx & (1 << 20)) && !(efer & EFER_NX)) {
 		entry->edx &= ~(1 << 20);
-		printk(KERN_INFO ": guest NX capability removed\n");
+		printk(KERN_INFO "kvm: guest NX capability removed\n");
 	}
 }