]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
KVM: Fix NX support reporting
authorAvi Kivity <avi@redhat.com>
Sun, 3 May 2009 13:34:21 +0000 (16:34 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 3 May 2009 13:34:21 +0000 (16:34 +0300)
NX support is bit 20, not bit 1.

Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/x86.c

index 5fcde2c9e18ffd83bd079ac72d85abc532b1b98e..8b0d77707e16eaa0b82709c142f9a055b35d05d9 100644 (file)
@@ -1266,7 +1266,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
                bit(X86_FEATURE_CMOV) | bit(X86_FEATURE_PSE36) |
                bit(X86_FEATURE_MMX) | bit(X86_FEATURE_FXSR) |
                bit(X86_FEATURE_SYSCALL) |
-               (bit(X86_FEATURE_NX) && is_efer_nx()) |
+               (is_efer_nx() ? bit(X86_FEATURE_NX) : 0) |
 #ifdef CONFIG_X86_64
                bit(X86_FEATURE_LM) |
 #endif