diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-12-07 07:14:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-07 07:14:18 -0500 |
commit | f3d607c6b39bd9cb5000e03e2c0dc2afe1241374 (patch) | |
tree | 885b5e0b5bb3d87efc4bfbde69feff2ece32ecac /arch/x86/kernel/cpu/intel_cacheinfo.c | |
parent | 8055039c2a2454c7159dcbde3161943b757a6e0e (diff) | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/intel_cacheinfo.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 8178d0352935..6c40f6b5b340 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -491,22 +491,6 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) | |||
491 | #endif | 491 | #endif |
492 | } | 492 | } |
493 | 493 | ||
494 | if (trace) | ||
495 | printk(KERN_INFO "CPU: Trace cache: %dK uops", trace); | ||
496 | else if (l1i) | ||
497 | printk(KERN_INFO "CPU: L1 I cache: %dK", l1i); | ||
498 | |||
499 | if (l1d) | ||
500 | printk(KERN_CONT ", L1 D cache: %dK\n", l1d); | ||
501 | else | ||
502 | printk(KERN_CONT "\n"); | ||
503 | |||
504 | if (l2) | ||
505 | printk(KERN_INFO "CPU: L2 cache: %dK\n", l2); | ||
506 | |||
507 | if (l3) | ||
508 | printk(KERN_INFO "CPU: L3 cache: %dK\n", l3); | ||
509 | |||
510 | c->x86_cache_size = l3 ? l3 : (l2 ? l2 : (l1i+l1d)); | 494 | c->x86_cache_size = l3 ? l3 : (l2 ? l2 : (l1i+l1d)); |
511 | 495 | ||
512 | return l2; | 496 | return l2; |