Merge branch 'master' into upstream-fixes

[linux-2.6-omap-h63xx.git] / include / asm-v850 / system.h

diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h
index 107decbd6e6cfc038a1729a77154f97ed5f65204..da39916f10b0cc523eb2c0907f8579b5445fdc41 100644 (file)
--- a/include/asm-v850/system.h
+++ b/include/asm-v850/system.h
@@ -18,8 +18,6 @@
 #include <asm/ptrace.h>
 
 
-#define prepare_to_switch()    do { } while (0)
-
 /*
  * switch_to(n) should switch tasks to task ptr, first checking that
  * ptr isn't the current task, in which case it does nothing.
@@ -70,7 +68,6 @@ static inline int irqs_disabled (void)
 #define read_barrier_depends() ((void)0)
 #define set_rmb(var, value)    do { xchg (&var, value); } while (0)
 #define set_mb(var, value)     set_rmb (var, value)
-#define set_wmb(var, value)    do { var = value; wmb (); } while (0)
 
 #define smp_mb()       mb ()
 #define smp_rmb()      rmb ()