diff options
| author | Kamble, Nitin A <nitin.a.kamble@intel.com> | 2005-10-30 17:59:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:13 -0500 |
| commit | daedb82d6b54e58a66ad1dce3509e699a5bd1b18 (patch) | |
| tree | f72c6f7c2a993284fe41fe43a8e95da259c419a8 /arch | |
| parent | 3d1675b41b02d64bd1185903ea0d25a8c0bb6dea (diff) | |
[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')
| -rw-r--r-- | arch/i386/kernel/cpu/proc.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index 8bd77d948a84..41b871ecf4b3 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c | |||
| @@ -44,7 +44,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 44 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 44 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 45 | 45 | ||
| 46 | /* Intel-defined (#2) */ | 46 | /* Intel-defined (#2) */ |
| 47 | "pni", NULL, NULL, "monitor", "ds_cpl", NULL, NULL, "est", | 47 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", NULL, "est", |
| 48 | "tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL, | 48 | "tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL, |
| 49 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 49 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 50 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 50 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
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) | |||
| 1213 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1213 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1214 | 1214 | ||
| 1215 | /* Intel-defined (#2) */ | 1215 | /* Intel-defined (#2) */ |
| 1216 | "pni", NULL, NULL, "monitor", "ds_cpl", NULL, NULL, "est", | 1216 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", NULL, "est", |
| 1217 | "tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL, | 1217 | "tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL, |
| 1218 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1218 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1219 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1219 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |