]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
ia64: rename nop->iosapic_nop
authorMichael S. Tsirkin <mst@redhat.com>
Mon, 28 Dec 2015 11:58:06 +0000 (13:58 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 12 Jan 2016 18:46:47 +0000 (20:46 +0200)
commit9505ec0825a09ea97426d026f2524d1cefa83a84
treefc0697c64862a2d7da8742bb36c086f8f41db4c2
parent57f7c0370f386d5e0960e25d2c3ceb0b8e8c489d
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>
arch/ia64/kernel/iosapic.c