]> git.baikalelectronics.ru Git - kernel.git/commit
[IA64] Resolve name space collision for cache_show()
authorTony Luck <tony.luck@intel.com>
Wed, 7 Nov 2012 23:51:04 +0000 (15:51 -0800)
committerTony Luck <tony.luck@intel.com>
Wed, 7 Nov 2012 23:51:04 +0000 (15:51 -0800)
commit76b3e0ef6ca59e1dbee26f245b18e455e0ab904e
tree16acaa4108bec61ad5fef16e5b4916728ff6d1ae
parent110a3aabcda3103953ddf3a66926d7280f13deed
[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 <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>
arch/ia64/kernel/topology.c