From 4fafc8c21487f6b5259d462e9bee98661a02390d Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Wed, 7 Nov 2012 15:51:04 -0800 Subject: [IA64] Resolve name space collision for cache_show() We have a local static function named rather generically "cache_show()". Changes in progress in the slab code want to use this same name globally - so they are adding their declaration to which then causes the compiler to choke with: arch/ia64/kernel/topology.c:278: error: conflicting types for 'cache_show' Fix by adding an "ia64_" prefix to our local function. Signed-off-by: Tony Luck --- arch/ia64/kernel/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/ia64') diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index c64460b9c704..dc00b2c1b42a 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -275,7 +275,7 @@ 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 ia64_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 +286,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 = ia64_cache_show }; static struct kobj_type cache_ktype = { -- cgit v1.2.3-59-g8ed1b