Exporting patch:
# HG changeset patch
# User Nitin A Kamble <nitin.a.kamble@intel.com>
# Node ID 33c697a2e9a73dc02333d2a699569e9830adbe38
# Parent  85f12afa556a8e22cd6e963704f6abe7d0df3aeb
addition of "vmx" in the /proc/cpuinfo.

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>

diff -r 85f12afa556a8e22cd6e963704f6abe7d0df3aeb -r 33c697a2e9a73dc02333d2a699569e9830adbe38 arch/i386/kernel/cpu/proc.c
--- a/arch/i386/kernel/cpu/proc.c	Mon Oct 10 17:39:26 2005
+++ b/arch/i386/kernel/cpu/proc.c	Tue Oct 11 20:19:37 2005
@@ -44,7 +44,7 @@
 		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,
diff -r 85f12afa556a8e22cd6e963704f6abe7d0df3aeb -r 33c697a2e9a73dc02333d2a699569e9830adbe38 arch/x86_64/kernel/setup.c
--- a/arch/x86_64/kernel/setup.c	Mon Oct 10 17:39:26 2005
+++ b/arch/x86_64/kernel/setup.c	Tue Oct 11 20:19:37 2005
@@ -1213,7 +1213,7 @@
 		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,