From: Michal Hocko <mhocko@suse.cz>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Wu Fengguang <fengguang.wu@intel.com>,
Glauber Costa <glommer@parallels.com>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>
Subject: Re: [PATCH] ia64: rename cache_show to topology_cache_show
Date: Fri, 15 Feb 2013 14:05:36 +0100 [thread overview]
Message-ID: <20130215130536.GB31037@dhcp22.suse.cz> (raw)
In-Reply-To: <1360931904-5720-1-git-send-email-mhocko@suse.cz>
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 <fengguang.wu@intel.com>
> Signed-off-by: Michal Hocko <mhocko@suse.cz>
> ---
> 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
next prev parent reply other threads:[~2013-02-15 13:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <511e236a.o0ibbB2U8xMoURgd%fengguang.wu@intel.com>
2013-02-15 12:38 ` [PATCH] ia64: rename cache_show to topology_cache_show Michal Hocko
2013-02-15 13:05 ` Michal Hocko [this message]
2013-02-15 22:46 ` Andrew Morton
2013-02-16 12:18 ` Michal Hocko
2013-02-17 1:36 ` Fengguang Wu
2013-02-17 9:54 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130215130536.GB31037@dhcp22.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=fengguang.wu@intel.com \
--cc=fenghua.yu@intel.com \
--cc=glommer@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).