summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-12-28 13:58:06 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-01-12 20:46:47 +0200
commit9505ec0825a09ea97426d026f2524d1cefa83a84 (patch)
treefc0697c64862a2d7da8742bb36c086f8f41db4c2 /arch/ia64/include
parent57f7c0370f386d5e0960e25d2c3ceb0b8e8c489d (diff)
downloadlinux-9505ec0825a09ea97426d026f2524d1cefa83a84.tar.bz2
ia64: rename nop->iosapic_nop
asm-generic/barrier.h defines a nop() macro. To be able to use this header on ia64, we shouldn't call local functions/variables nop(). There's one instance where this breaks on ia64: rename the function to iosapic_nop to avoid the conflict. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Tony Luck <tony.luck@intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to 'arch/ia64/include')
0 files changed, 0 insertions, 0 deletions