]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] i386/x86-64: List Intel LaGrange AKA SMX in /proc/cpuinfo
authorAndi Kleen <ak@suse.de>
Sat, 25 Mar 2006 15:31:22 +0000 (16:31 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 17:10:57 +0000 (09:10 -0800)
Spec just got published so we know the CPUID bit.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/cpu/proc.c
arch/x86_64/kernel/setup.c

index 5cfbd80116988cbd34d8e6c8fe51aa40fdfc850b..f94cdb7aca50326dad04dd698521bfcb756fa7cf 100644 (file)
@@ -45,7 +45,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", "vmx", NULL, "est",
+               "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "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,
index 8acf5313e835f7d7c35d202e0b5f3e8d2e0c9f84..db70090a08f7a86fecbefdfc53b6da234779b6ec 100644 (file)
@@ -1280,7 +1280,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", "vmx", NULL, "est",
+               "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "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,