Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754646AbZDMExn (ORCPT ); Mon, 13 Apr 2009 00:53:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752846AbZDMExd (ORCPT ); Mon, 13 Apr 2009 00:53:33 -0400 Received: from hera.kernel.org ([140.211.167.34]:49921 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752341AbZDMExc (ORCPT ); Mon, 13 Apr 2009 00:53:32 -0400 Subject: Re: [tip:x86/cpu] x86: cacheinfo: replace sysfs interface for cache_disable feature From: Jaswinder Singh Rajput To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, andreas.herrmann3@amd.com, akpm@linux-foundation.org, mark.langsdorf@amd.com, tglx@linutronix.de, mingo@elte.hu Cc: linux-tip-commits@vger.kernel.org In-Reply-To: References: <20090409131849.GJ31527@alberich.amd.com> Content-Type: text/plain; charset="UTF-8" Date: Mon, 13 Apr 2009 10:22:04 +0530 Message-Id: <1239598324.2983.2.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3447 Lines: 87 Hello Mark, On Fri, 2009-04-10 at 12:37 +0000, Mark Langsdorf wrote: > Commit-ID: f8b201fc7110c3673437254e8ba02451461ece0b > Gitweb: http://git.kernel.org/tip/f8b201fc7110c3673437254e8ba02451461ece0b > Author: Mark Langsdorf > AuthorDate: Thu, 9 Apr 2009 15:18:49 +0200 > Committer: Ingo Molnar > CommitDate: Fri, 10 Apr 2009 14:21:53 +0200 > > x86: cacheinfo: replace sysfs interface for cache_disable feature > > Impact: replace sysfs attribute > > Current interface violates against "one-value-per-sysfs-attribute > rule". This patch replaces current attribute with two attributes -- > one for each L3 Cache Index Disable register. > > Signed-off-by: Mark Langsdorf > Signed-off-by: Andreas Herrmann > Cc: Andrew Morton > LKML-Reference: <20090409131849.GJ31527@alberich.amd.com> > Signed-off-by: Ingo Molnar > > > --- > arch/x86/kernel/cpu/intel_cacheinfo.c | 90 ++++++++++++++++---------------- > 1 files changed, 45 insertions(+), 45 deletions(-) > > diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c > index 0cde071..fc28291 100644 > --- a/arch/x86/kernel/cpu/intel_cacheinfo.c > +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c > @@ -697,73 +697,69 @@ static ssize_t show_type(struct _cpuid4_info *this_leaf, char *buf) > #define to_object(k) container_of(k, struct _index_kobject, kobj) > #define to_attr(a) container_of(a, struct _cache_attr, attr) > > -static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf) > +static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf, > + unsigned int index) > { > - const struct cpumask *mask = to_cpumask(this_leaf->shared_cpu_map); > - int node = cpu_to_node(cpumask_first(mask)); > - struct pci_dev *dev = NULL; > - ssize_t ret = 0; > - int i; > + int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map)); > + int node = cpu_to_node(cpu); > + struct pci_dev *dev = node_to_k8_nb_misc(node); > + unsigned int reg = 0; This leads to compilation warnings: CC arch/x86/kernel/cpu/intel_cacheinfo.o arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘show_cache_disable’: arch/x86/kernel/cpu/intel_cacheinfo.c:712: warning: unused variable ‘node’ > > -static ssize_t > -store_cache_disable(struct _cpuid4_info *this_leaf, const char *buf, > - size_t count) > +static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf, > + const char *buf, size_t count, unsigned int index) > { > - const struct cpumask *mask = to_cpumask(this_leaf->shared_cpu_map); > - int node = cpu_to_node(cpumask_first(mask)); > - struct pci_dev *dev = NULL; > - unsigned int ret, index, val; > + int cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map)); > + int node = cpu_to_node(cpu); > + struct pci_dev *dev = node_to_k8_nb_misc(node); > + unsigned long val = 0; > CC arch/x86/kernel/cpu/intel_cacheinfo.o arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘store_cache_disable’: arch/x86/kernel/cpu/intel_cacheinfo.c:737: warning: unused variable ‘cpu’ Thanks, -- JSR -- 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/