projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19bca6a
)
KVM: Fix NX support reporting
author
Avi Kivity
<avi@redhat.com>
Sun, 3 May 2009 13:34:21 +0000
(16:34 +0300)
committer
Avi Kivity
<avi@redhat.com>
Mon, 11 May 2009 08:18:48 +0000
(11:18 +0300)
NX support is bit 20, not bit 1.
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/x86.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/x86.c
b/arch/x86/kvm/x86.c
index
7c1ce5a
..
834a7bf
100644
(file)
--- 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