Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70f2836d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 97ebe8f5 4fafc8c2

arch/ia64/kernel/topology.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = {