Commit e1054b39 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Thomas Gleixner
Browse files

x86: additional CPUID strings; fix strings for AMD-ecx 



Additional CPUID strings (sse4_1, sse4_2, sse5, skinit, wdt); fix the
positioning of the AMD ecx strings (cr8_legacy was duplicated under
two different names, so the alignment of all the other strings were
off by one.)

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 82798a17

arch/x86/kernel/cpu/proc.c

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		/* Intel-defined (#2) */

		"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",

		"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,

		NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt",

		NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* VIA/Cyrix/Centaur-defined */
@@ -59,10 +59,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* AMD-defined (#2) */

		"lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy",

		"altmovcr8", "abm", "sse4a",

		"misalignsse", "3dnowprefetch",

		"osvw", "ibs", NULL, NULL, NULL, NULL,

		"lahf_lm", "cmp_legacy", "svm", "extapic",

		"cr8_legacy", "abm", "sse4a", "misalignsse",

		"3dnowprefetch", "osvw", "ibs", "sse5",

		"skinit", "wdt", NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

arch/x86/kernel/setup_64.c

+5 −5
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		/* Intel-defined (#2) */

		"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",

		"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,

		NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt",

		NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* VIA/Cyrix/Centaur-defined */
@@ -1050,10 +1050,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* AMD-defined (#2) */

		"lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy",

		"altmovcr8", "abm", "sse4a",

		"misalignsse", "3dnowprefetch",

		"osvw", "ibs", NULL, NULL, NULL, NULL,

		"lahf_lm", "cmp_legacy", "svm", "extapic",

		"cr8_legacy", "abm", "sse4a", "misalignsse",

		"3dnowprefetch", "osvw", "ibs", "sse5",

		"skinit", "wdt", NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

CRA Git | Maintained and supported by SUSTech CRA and CCSE