redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[IA64] Resolve name space collision for cache_show()

Browse source 
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 <linux/slab.h> 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 <tony.luck@intel.com>
This commit is contained in:
Tony Luck 2012-11-07 15:51:04 -08:00
parent 3d70f8c617
commit 4fafc8c214
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/ia64/kernel/topology.c
View file

@ -275,7 +275,7 @@ static struct attribute * cache_default_attrs[] = {
#define to_object(k) container_of(k, struct cache_info, kobj) #define to_object(k) container_of(k, struct cache_info, kobj)
#define to_attr(a) container_of(a, struct cache_attr, attr) #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_attr *fattr = to_attr(attr);
struct cache_info *this_leaf = to_object(kobj); 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 = { static const struct sysfs_ops cache_sysfs_ops = {
.show = cache_show .show = ia64_cache_show
}; };
static struct kobj_type cache_ktype = { static struct kobj_type cache_ktype = {