From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx199.postini.com [74.125.245.199]) by kanga.kvack.org (Postfix) with SMTP id 211646B0023 for ; Fri, 15 Feb 2013 08:05:39 -0500 (EST) Date: Fri, 15 Feb 2013 14:05:36 +0100 From: Michal Hocko Subject: Re: [PATCH] ia64: rename cache_show to topology_cache_show Message-ID: <20130215130536.GB31037@dhcp22.suse.cz> References: <511e236a.o0ibbB2U8xMoURgd%fengguang.wu@intel.com> <1360931904-5720-1-git-send-email-mhocko@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1360931904-5720-1-git-send-email-mhocko@suse.cz> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wu Fengguang , Glauber Costa , Tony Luck , Fenghua Yu Scratch that. I should have checked origin/master which already fixed that by 4fafc8c21487f6b5259d462e9bee98661a02390d Sorry for the noise. On Fri 15-02-13 13:38:24, Michal Hocko wrote: > Fenguang Wu has reported the following compile time issue > arch/ia64/kernel/topology.c:278:16: error: conflicting types for 'cache_show' > include/linux/slab.h:224:5: note: previous declaration of 'cache_show' was here > > which has been introduced by 749c5415 (memcg: aggregate memcg cache > values in slabinfo). Let's rename ia64 local function to prevent from > the name conflict. > > Reported-by: Fenguang Wu > Signed-off-by: Michal Hocko > --- > arch/ia64/kernel/topology.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c > index c64460b..d9e2152 100644 > --- a/arch/ia64/kernel/topology.c > +++ b/arch/ia64/kernel/topology.c > @@ -275,7 +275,8 @@ static struct attribute * cache_default_attrs[] = { > #define to_object(k) container_of(k, struct cache_info, kobj) > #define to_attr(a) container_of(a, struct cache_attr, attr) > > -static ssize_t cache_show(struct kobject * kobj, struct attribute * attr, char * buf) > +static ssize_t topology_cache_show(struct kobject * kobj, > + struct attribute * attr, char * buf) > { > struct cache_attr *fattr = to_attr(attr); > struct cache_info *this_leaf = to_object(kobj); > @@ -286,7 +287,7 @@ static ssize_t cache_show(struct kobject * kobj, struct attribute * attr, char * > } > > static const struct sysfs_ops cache_sysfs_ops = { > - .show = cache_show > + .show = topology_cache_show > }; > > static struct kobj_type cache_ktype = { > -- > 1.7.10.4 > > -- > 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/ -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org