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 <[email protected]> Signed-off-by: Michal Hocko <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
