summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorKamble, Nitin A <nitin.a.kamble@intel.com>2005-10-30 23:59:43 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 02:37:13 +0100
commitdaedb82d6b54e58a66ad1dce3509e699a5bd1b18 (patch)
treef72c6f7c2a993284fe41fe43a8e95da259c419a8 /arch/x86_64
parent[PATCH] i386 kexec-on-panic: Don't shutdown the apics. (diff)
downloadlinux-daedb82d6b54e58a66ad1dce3509e699a5bd1b18.tar.xz
linux-daedb82d6b54e58a66ad1dce3509e699a5bd1b18.zip
[PATCH] x86: vmx cpu feature detection
If VMX feature is available in the CPU, this patch will make it visible in the /proc/cpuinfo with the cpuid detection. Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index cb28df14ff6f..da0bc3e7bdf5 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -1213,7 +1213,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* Intel-defined (#2) */
- "pni", NULL, NULL, "monitor", "ds_cpl", NULL, NULL, "est",
+ "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", NULL, "est",
"tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,