summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 19:50:18 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 19:50:18 +0400
commit70f2836d023237868f2fef3625da84643e5aaf33 (patch)
tree982331c1a7980003123566d1ad7280d3a2c86e42
parent97ebe8f55ae99059c0ad3d3be5c0417647f5e3e0 (diff)
parent4fafc8c21487f6b5259d462e9bee98661a02390d (diff)
downloadlinux-70f2836d023237868f2fef3625da84643e5aaf33.tar.xz
Merge tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 fix from Tony Luck: "Miscellaneous ia64 fix for 3.8. Just need to avoid a pending namespace collision from other work being merged." * tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Resolve name space collision for cache_show()
-rw-r--r--arch/ia64/kernel/topology.c4
1 files changed, 2 insertions, 2 deletions
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 = {