aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 16:42:51 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 22:01:12 -0500
commit3f98bc4991df8e7b5972489b4632e1e5c03cd1ee (patch)
tree877fc1305c6d2713a891fc52cc5babbe5c0d62dc /arch/x86_64
parent152bf8c55d657898c40c8ed270630c0cf9d51f7d (diff)
[PATCH] i386/x86-64: Update AMD CPUID flags
Print bits for RDTSCP, SVM, CR8-LEGACY. Also now print power flags on i386 like x86-64 always did. This will add a new line in the 386 cpuinfo, but that shouldn't be an issue - did that in the past too and I haven't heard of any breakage. I shrunk some of the fields in the i386 cpuinfo_x86 to chars to make up for the new int "x86_power" field. Overall it's smaller than before. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/setup.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index d9c1c3bd6150..ee3a5cd7d8d9 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -1233,7 +1233,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
1233 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1233 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
1234 NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL, 1234 NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
1235 NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL, 1235 NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
1236 NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow", 1236 NULL, "fxsr_opt", "rdtscp", NULL, NULL, "lm", "3dnowext", "3dnow",
1237 1237
1238 /* Transmeta-defined */ 1238 /* Transmeta-defined */
1239 "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL, 1239 "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
@@ -1261,7 +1261,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
1261 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1261 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
1262 1262
1263 /* AMD-defined (#2) */ 1263 /* AMD-defined (#2) */
1264 "lahf_lm", "cmp_legacy", NULL, NULL, NULL, NULL, NULL, NULL, 1264 "lahf_lm", "cmp_legacy", "svm", NULL, "cr8_legacy", NULL, NULL, NULL,
1265 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1265 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
1266 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1266 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
1267 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1267 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -1272,8 +1272,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
1272 "vid", /* voltage id control */ 1272 "vid", /* voltage id control */
1273 "ttp", /* thermal trip */ 1273 "ttp", /* thermal trip */
1274 "tm", 1274 "tm",
1275 "stc" 1275 "stc",
1276 "?", 1276 NULL,
1277 /* nothing */ /* constant_tsc - moved to flags */ 1277 /* nothing */ /* constant_tsc - moved to flags */
1278 }; 1278 };
1279 1279
@@ -1354,8 +1354,11 @@ static int show_cpuinfo(struct seq_file *m, void *v)
1354 unsigned i; 1354 unsigned i;
1355 for (i = 0; i < 32; i++) 1355 for (i = 0; i < 32; i++)
1356 if (c->x86_power & (1 << i)) { 1356 if (c->x86_power & (1 << i)) {
1357 if (i < ARRAY_SIZE(x86_power_flags)) 1357 if (i < ARRAY_SIZE(x86_power_flags) &&
1358 seq_printf(m, " %s", x86_power_flags[i]); 1358 x86_power_flags[i])
1359 seq_printf(m, "%s%s",
1360 x86_power_flags[i][0]?" ":"",
1361 x86_power_flags[i]);
1359 else 1362 else
1360 seq_printf(m, " [%d]", i); 1363 seq_printf(m, " [%d]", i);
1361 } 1364 }