diff options
| author | Avi Kivity <avi@redhat.com> | 2009-05-03 16:34:21 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-05-11 11:18:48 +0300 |
| commit | 334b8ad7b182fc14d720acd7729afda3ab4c7e3a (patch) | |
| tree | 695c1cd225be64cba2690c3e07371d5b1847556f /arch | |
| parent | 19bca6ab75d8118ae970fcc656359ddb467ac763 (diff) | |
| download | linux-334b8ad7b182fc14d720acd7729afda3ab4c7e3a.tar.bz2 | |
KVM: Fix NX support reporting
NX support is bit 20, not bit 1.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7c1ce5ac6131..834a7bf25e48 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1259,7 +1259,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 |