summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/processor.h
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-12-21 09:22:18 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-01-12 20:46:49 +0200
commit519be0438e6963b8efd2430e9d0595f5aeee915e (patch)
tree8cd6c08f5e43cebc052cc76d870e24b033d571b9 /arch/sparc/include/asm/processor.h
parent21535aaed9e33b4cc485ab2245dd2958816ee916 (diff)
sparc: reuse asm-generic/barrier.h
On sparc 64 bit dma_rmb, dma_wmb, smp_store_mb, smp_mb, smp_rmb, smp_wmb, read_barrier_depends and smp_read_barrier_depends match the asm-generic variants exactly. Drop the local definitions and pull in asm-generic/barrier.h instead. nop uses __asm__ __volatile but is otherwise identical to the generic version, drop that as well. This is in preparation to refactoring this code area. Note: nop() was in processor.h and not in barrier.h as on other architectures. Nothing seems to depend on it being there though. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to 'arch/sparc/include/asm/processor.h')
-rw-r--r--arch/sparc/include/asm/processor.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/processor.h b/arch/sparc/include/asm/processor.h
index 2fe99e66e760..9da9646bf6c6 100644
--- a/arch/sparc/include/asm/processor.h
+++ b/arch/sparc/include/asm/processor.h
@@ -5,7 +5,4 @@
#else
#include <asm/processor_32.h>
#endif
-
-#define nop() __asm__ __volatile__ ("nop")
-
#endif