From fd1bcff64ba782186c88b4670805fcc59436ed57 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 25 Jul 2007 09:22:12 +0300 Subject: [PATCH] --- yaml --- r: 62877 b: refs/heads/master c: 4c981b43d7ec18818754bf85b829865abd0ce340 h: refs/heads/master i: 62875: 1c0357b6793d238abe72e8cb2c738958fa11c8c5 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/kvm_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bf6997c58f7..54280a7a4bad 100644 --- 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 index a8d8db8e3ccb..96856097d15b 100644 --- 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"); } }