Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[pandora-kernel.git] / include / asm-alpha / barrier.h

diff --git a/include/asm-alpha/barrier.h b/include/asm-alpha/barrier.h
index 229c83f..ac78eba 100644 (file)
--- a/include/asm-alpha/barrier.h
+++ b/include/asm-alpha/barrier.h
@@ -1,6 +1,8 @@
 #ifndef __BARRIER_H
 #define __BARRIER_H
 
+#include <asm/compiler.h>
+
 #define mb() \
 __asm__ __volatile__("mb": : :"memory")
 
@@ -22,13 +24,10 @@ __asm__ __volatile__("mb": : :"memory")
 #define smp_mb()       barrier()
 #define smp_rmb()      barrier()
 #define smp_wmb()      barrier()
-#define smp_read_barrier_depends()     barrier()
+#define smp_read_barrier_depends()     do { } while (0)
 #endif
 
 #define set_mb(var, value) \
 do { var = value; mb(); } while (0)
 
-#define set_wmb(var, value) \
-do { var = value; wmb(); } while (0)
-
 #endif         /* __BARRIER_H */