include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros

These don't appear anywhere else in the kernel anymore.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

diff --git a/include/asm-blackfin/system.h b/include/asm-blackfin/system.h
index 2b3d47d0bbb692f62d9242adba7adec523cc0723..4a927379ee1ce9c5fdc006fe2a3bbed851f3d1eb 100644 (file)
--- a/include/asm-blackfin/system.h
+++ b/include/asm-blackfin/system.h
@@ -128,9 +128,7 @@ extern unsigned long irq_flags;
 #define mb()   asm volatile (""   : : :"memory")
 #define rmb()  asm volatile (""   : : :"memory")
 #define wmb()  asm volatile (""   : : :"memory")
-#define set_rmb(var, value)    do { (void) 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 set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 
 #define read_barrier_depends()                 do { } while(0)
 

diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index 7807018f85002cd201db14dc74926f469b3c11b5..2c1e83f7b4191568bcb1880cc5f423c7bdaa3773 100644 (file)
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -82,8 +82,7 @@ asmlinkage void resume(void);
 #define mb()   asm volatile (""   : : :"memory")
 #define rmb()  asm volatile (""   : : :"memory")
 #define wmb()  asm volatile (""   : : :"memory")
-#define set_rmb(var, value)    do { xchg(&var, value); } while (0)
-#define set_mb(var, value)     set_rmb(var, value)
+#define set_mb(var, value) do { xchg(&var, value); } while (0)
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()

diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h
index 1bd1142685e18f5dd916c0dcf838fe1e3c2435df..15b4c7d45c94a643865b511040cff2e5dcd0e04a 100644 (file)
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
@@ -104,8 +104,7 @@ asmlinkage void resume(void);
 #define mb()   asm volatile (""   : : :"memory")
 #define rmb()  asm volatile (""   : : :"memory")
 #define wmb()  asm volatile (""   : : :"memory")
-#define set_rmb(var, value)    do { xchg(&var, value); } while (0)
-#define set_mb(var, value)     set_rmb(var, value)
+#define set_mb(var, value) do { xchg(&var, value); } while (0)
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()

diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
index 5ff94644e8c87f4c47c0a24d5c539a9edcb07231..be2a15ffcc5535fb2e1c49db209b318a26047626 100644 (file)
--- a/include/asm-sh64/system.h
+++ b/include/asm-sh64/system.h
@@ -62,8 +62,7 @@ extern void __xchg_called_with_bad_pointer(void);
 #define smp_read_barrier_depends()     do { } while (0)
 #endif /* CONFIG_SMP */
 
-#define set_rmb(var, value) do { (void)xchg(&var, value); } while (0)
-#define set_mb(var, value) set_rmb(var, value)
+#define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
 
 /* Interrupt Control */
 #ifndef HARD_CLI

diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h
index 0de2481fd990dcb247e42488be480c8259b40a84..a34ddfafd56195bae8db73dfa08f987de2a73ed2 100644 (file)
--- a/include/asm-v850/system.h
+++ b/include/asm-v850/system.h
@@ -66,8 +66,7 @@ static inline int irqs_disabled (void)
 #define rmb()                  mb ()
 #define wmb()                  mb ()
 #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_mb(var, value)     do { xchg (&var, value); } while (0)
 
 #define smp_mb()       mb ()
 #define smp_rmb()      rmb ()