From: Tony Luck <tony.luck@intel.com>
Date: Wed, 7 Nov 2012 23:51:04 +0000 (-0800)
Subject: [IA64] Resolve name space collision for cache_show()
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~64^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fafc8c21487f6b5259d462e9bee98661a02390d;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed