diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-10-26 17:09:09 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-29 19:22:22 -0400 |
| commit | e1054b39b275340f7ba0308eca83c127b36e936e (patch) | |
| tree | ee98058749b7aaae72bffa56669b8b74ee6061cf | |
| parent | 82798a17ad40df827d465329a20ace80497f9b32 (diff) | |
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: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/cpu/proc.c | 10 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index 2d42b414b777..066f8c6af4df 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c | |||
| @@ -49,7 +49,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 49 | /* Intel-defined (#2) */ | 49 | /* Intel-defined (#2) */ |
| 50 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est", | 50 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est", |
| 51 | "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, | 51 | "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, |
| 52 | NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt", | 52 | NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt", |
| 53 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 53 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 54 | 54 | ||
| 55 | /* VIA/Cyrix/Centaur-defined */ | 55 | /* VIA/Cyrix/Centaur-defined */ |
| @@ -59,10 +59,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 59 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 59 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 60 | 60 | ||
| 61 | /* AMD-defined (#2) */ | 61 | /* AMD-defined (#2) */ |
| 62 | "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy", | 62 | "lahf_lm", "cmp_legacy", "svm", "extapic", |
| 63 | "altmovcr8", "abm", "sse4a", | 63 | "cr8_legacy", "abm", "sse4a", "misalignsse", |
| 64 | "misalignsse", "3dnowprefetch", | 64 | "3dnowprefetch", "osvw", "ibs", "sse5", |
| 65 | "osvw", "ibs", NULL, NULL, NULL, NULL, | 65 | "skinit", "wdt", NULL, NULL, |
| 66 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 66 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 67 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 67 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 68 | 68 | ||
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index e7a9e36bd52d..238633d3d09a 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
| @@ -1040,7 +1040,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 1040 | /* Intel-defined (#2) */ | 1040 | /* Intel-defined (#2) */ |
| 1041 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est", | 1041 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est", |
| 1042 | "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, | 1042 | "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, |
| 1043 | NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt", | 1043 | NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt", |
| 1044 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1044 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1045 | 1045 | ||
| 1046 | /* VIA/Cyrix/Centaur-defined */ | 1046 | /* VIA/Cyrix/Centaur-defined */ |
| @@ -1050,10 +1050,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 1050 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1050 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1051 | 1051 | ||
| 1052 | /* AMD-defined (#2) */ | 1052 | /* AMD-defined (#2) */ |
| 1053 | "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy", | 1053 | "lahf_lm", "cmp_legacy", "svm", "extapic", |
| 1054 | "altmovcr8", "abm", "sse4a", | 1054 | "cr8_legacy", "abm", "sse4a", "misalignsse", |
| 1055 | "misalignsse", "3dnowprefetch", | 1055 | "3dnowprefetch", "osvw", "ibs", "sse5", |
| 1056 | "osvw", "ibs", NULL, NULL, NULL, NULL, | 1056 | "skinit", "wdt", NULL, NULL, |
| 1057 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1057 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1058 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1058 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
| 1059 | 1059 | ||