diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 10:50:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 10:50:18 -0500 |
| commit | 70f2836d023237868f2fef3625da84643e5aaf33 (patch) | |
| tree | 982331c1a7980003123566d1ad7280d3a2c86e42 /arch/ia64 | |
| parent | 97ebe8f55ae99059c0ad3d3be5c0417647f5e3e0 (diff) | |
| parent | 4fafc8c21487f6b5259d462e9bee98661a02390d (diff) | |
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()
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/topology.c | 4 |
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[] = { | |||
| 275 | #define to_object(k) container_of(k, struct cache_info, kobj) | 275 | #define to_object(k) container_of(k, struct cache_info, kobj) |
| 276 | #define to_attr(a) container_of(a, struct cache_attr, attr) | 276 | #define to_attr(a) container_of(a, struct cache_attr, attr) |
| 277 | 277 | ||
| 278 | static ssize_t cache_show(struct kobject * kobj, struct attribute * attr, char * buf) | 278 | static ssize_t ia64_cache_show(struct kobject * kobj, struct attribute * attr, char * buf) |
| 279 | { | 279 | { |
| 280 | struct cache_attr *fattr = to_attr(attr); | 280 | struct cache_attr *fattr = to_attr(attr); |
| 281 | struct cache_info *this_leaf = to_object(kobj); | 281 | struct cache_info *this_leaf = to_object(kobj); |
| @@ -286,7 +286,7 @@ static ssize_t cache_show(struct kobject * kobj, struct attribute * attr, char * | |||
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | static const struct sysfs_ops cache_sysfs_ops = { | 288 | static const struct sysfs_ops cache_sysfs_ops = { |
| 289 | .show = cache_show | 289 | .show = ia64_cache_show |
| 290 | }; | 290 | }; |
| 291 | 291 | ||
| 292 | static struct kobj_type cache_ktype = { | 292 | static struct kobj_type cache_ktype = { |