Merge commit '3cf2f34' into sched/core, to fix build error

[linux-2.6-block.git] / arch / metag / include / asm / barrier.h

diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
index 2d6f0de7732529212bf4a9256bb3720386e39e71..c7591e80067c0e9fc150872262d9375a0faad6e6 100644 (file)
--- a/arch/metag/include/asm/barrier.h
+++ b/arch/metag/include/asm/barrier.h
@@ -100,4 +100,7 @@ do {                                                                        \
        ___p1;                                                          \
 })
 
+#define smp_mb__before_atomic()        barrier()
+#define smp_mb__after_atomic() barrier()
+
 #endif /* _ASM_METAG_BARRIER_H */