Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753246AbZKNA4x (ORCPT ); Fri, 13 Nov 2009 19:56:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752618AbZKNA4v (ORCPT ); Fri, 13 Nov 2009 19:56:51 -0500 Received: from hera.kernel.org ([140.211.167.34]:42024 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbZKNA4u (ORCPT ); Fri, 13 Nov 2009 19:56:50 -0500 Date: Sat, 14 Nov 2009 00:54:37 GMT From: tip-bot for Roland Dreier Cc: mingo@redhat.com, rusty@rustcorp.com.au, fweisbec@gmail.com, rostedt@goodmis.org, gregkh@suse.de, ak@linux.intel.com, heiko.carstens@de.ibm.com, tglx@linutronix.de, rientjes@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, yinghai@kernel.org, seto.hidetoshi@jp.fujitsu.com, travis@sgi.com, davej@redhat.com, rdunlap@xenotime.net, steiner@sgi.com, rdreier@cisco.com, tj@kernel.org, rolandd@cisco.com, mingo@elte.hu Reply-To: mingo@redhat.com, rusty@rustcorp.com.au, fweisbec@gmail.com, rostedt@goodmis.org, gregkh@suse.de, ak@linux.intel.com, heiko.carstens@de.ibm.com, tglx@linutronix.de, rientjes@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, yinghai@kernel.org, seto.hidetoshi@jp.fujitsu.com, travis@sgi.com, davej@redhat.com, rdunlap@xenotime.net, rdreier@cisco.com, steiner@sgi.com, tj@kernel.org, rolandd@cisco.com, mingo@elte.hu In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86: Remove CPU cache size output for non-Intel too Message-ID: Git-Commit-ID: b01c845f0f2e3f9e54e6a78d5d56895f5b95e818 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2544 Lines: 65 Commit-ID: b01c845f0f2e3f9e54e6a78d5d56895f5b95e818 Gitweb: http://git.kernel.org/tip/b01c845f0f2e3f9e54e6a78d5d56895f5b95e818 Author: Roland Dreier AuthorDate: Fri, 13 Nov 2009 14:38:26 -0800 Committer: Ingo Molnar CommitDate: Sat, 14 Nov 2009 01:51:18 +0100 x86: Remove CPU cache size output for non-Intel too As Dave Jones said about the output in intel_cacheinfo.c: "They aren't useful, and pollute the dmesg output a lot (especially on machines with many cores). Also the same information can be trivially found out from userspace." Give the generic display_cacheinfo() function the same treatment. Signed-off-by: Roland Dreier Acked-by: Dave Jones Cc: Mike Travis Cc: Andi Kleen Cc: Heiko Carstens Cc: Randy Dunlap Cc: Tejun Heo Cc: Greg Kroah-Hartman Cc: Yinghai Lu Cc: David Rientjes Cc: Steven Rostedt Cc: Rusty Russell Cc: Hidetoshi Seto Cc: Jack Steiner Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/common.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 617a29f..9db1e24 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -391,8 +391,6 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) if (n >= 0x80000005) { cpuid(0x80000005, &dummy, &ebx, &ecx, &edx); - printk(KERN_INFO "CPU: L1 I Cache: %dK (%d bytes/line), D cache %dK (%d bytes/line)\n", - edx>>24, edx&0xFF, ecx>>24, ecx&0xFF); c->x86_cache_size = (ecx>>24) + (edx>>24); #ifdef CONFIG_X86_64 /* On K8 L1 TLB is inclusive, so don't count it */ @@ -422,9 +420,6 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) #endif c->x86_cache_size = l2size; - - printk(KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n", - l2size, ecx & 0xFF); } void __cpuinit detect_ht(struct cpuinfo_x86 *c) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/