[PATCH] remove set_wmb - arch removal

set_wmb should not be used in the kernel because it just confuses the
code more and has no benefit.  Since it is not currently used in the
kernel this patch removes it so that new code does not include it.

All archs define set_wmb(var, value) to do { var = value; wmb(); }
while(0) except ia64 and sparc which use a mb() instead.  But this is
still moot since it is not used anyway.

Hasn't been tested on any archs but x86 and x86_64 (and only compiled
tested)

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-alpha/barrier.h b/include/asm-alpha/barrier.h
index 681ff581afa574a404e19038abbda9d1f194489c..384dc08d6f53d26974b87511e498719a1fe84c4f 100644 (file)
--- a/include/asm-alpha/barrier.h
+++ b/include/asm-alpha/barrier.h
@@ -30,7 +30,4 @@ __asm__ __volatile__("mb": : :"memory")
 #define set_mb(var, value) \
 do { var = value; mb(); } while (0)
 
 #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 */
 #endif         /* __BARRIER_H */

diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 6001febfe63bcf0fdf4fb61d2b991a19f67ec057..0947cbf9b69a3394bd3cba0803a112ece0c183c1 100644 (file)
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -176,7 +176,6 @@ extern unsigned int user_debug;
 #define wmb() mb()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)
 #define wmb() mb()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)

 #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
 
 /*
 #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
 
 /*

diff --git a/include/asm-arm26/system.h b/include/asm-arm26/system.h
index d1f69d7061986b4f6ce2588e949205dade591a9d..00ae32aa1dbaf2f1ad0ac3e86d66b55d09581b1b 100644 (file)
--- a/include/asm-arm26/system.h
+++ b/include/asm-arm26/system.h
@@ -90,7 +90,6 @@ extern unsigned int user_debug;
 
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)
 
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)

 
 /*
  * We assume knowledge of how
 
 /*
  * We assume knowledge of how

diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index b1c593b6dbff163df5118bc6ba8c5841148fd43a..b869f6161aaa1c73e770fb2f238eecc7894654d9 100644 (file)
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -17,7 +17,6 @@ extern struct task_struct *resume(struct task_struct *prev, struct task_struct *
 #define wmb() mb()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)
 #define wmb() mb()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)

 
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()
 
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()

diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index 351863dfd06e14528b6237bd01fe1f124d0ff64c..1166899317d78a8ca248d798216d3391e0484b8e 100644 (file)
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -179,7 +179,6 @@ do {                                                        \
 #define rmb()                  asm volatile ("membar" : : :"memory")
 #define wmb()                  asm volatile ("membar" : : :"memory")
 #define set_mb(var, value)     do { var = value; mb(); } while (0)
 #define rmb()                  asm volatile ("membar" : : :"memory")
 #define wmb()                  asm volatile ("membar" : : :"memory")
 #define set_mb(var, value)     do { var = value; mb(); } while (0)

-#define set_wmb(var, value)    do { var = value; wmb(); } while (0)

 
 #define smp_mb()               mb()
 #define smp_rmb()              rmb()
 
 #define smp_mb()               mb()
 #define smp_rmb()              rmb()

diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index 134e0929fce5500939b4d4bee7d34bd03d400890..5084a9d4292254f28a638302cc3bc0eb9b609069 100644 (file)
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -84,7 +84,6 @@ asmlinkage void resume(void);
 #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 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_wmb(var, value)    do { var = value; wmb(); } while (0)

 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()

diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 2db168ef949f4ba4a86c3cb4a3028542e0d95bf4..49928eb33f8bbd830ac1937a7ff5b50de1adec5d 100644 (file)
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -453,8 +453,6 @@ static inline unsigned long long __cmpxchg64(volatile void *ptr, unsigned long l
 #define set_mb(var, value) do { var = value; barrier(); } while (0)
 #endif
 
 #define set_mb(var, value) do { var = value; barrier(); } while (0)
 #endif
 

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
-

 #include <linux/irqflags.h>
 
 /*
 #include <linux/irqflags.h>
 
 /*

diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h
index 65db43ce4de6e533a89a81d2df70ec6e799d8962..fc9677bc87ee8f1e1a0b4d9d501da8ea798a6482 100644 (file)
--- a/include/asm-ia64/system.h
+++ b/include/asm-ia64/system.h
@@ -98,12 +98,11 @@ extern struct ia64_boot_param {
 #endif
 
 /*
 #endif
 
 /*

- * XXX check on these---I suspect what Linus really wants here is
+ * XXX check on this ---I suspect what Linus really wants here is

  * acquire vs release semantics but we can't discuss this stuff with
  * Linus just yet.  Grrr...
  */
 #define set_mb(var, value)     do { (var) = (value); mb(); } while (0)
  * acquire vs release semantics but we can't discuss this stuff with
  * Linus just yet.  Grrr...
  */
 #define set_mb(var, value)     do { (var) = (value); mb(); } while (0)

-#define set_wmb(var, value)    do { (var) = (value); mb(); } while (0)

 
 #define safe_halt()         ia64_pal_halt_light()    /* PAL_HALT_LIGHT */
 
 
 #define safe_halt()         ia64_pal_halt_light()    /* PAL_HALT_LIGHT */
 

diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 311cebf44eff76ecf96ca6e69ffcd7b72be77123..9e618afec6ed7bd6480962dfa85abb2931c61e7a 100644 (file)
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -336,7 +336,6 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 #endif
 
 #define set_mb(var, value) do { xchg(&var, value); } while (0)
 #endif
 
 #define set_mb(var, value) do { xchg(&var, value); } while (0)

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)

 
 #define arch_align_stack(x) (x)
 
 
 #define arch_align_stack(x) (x)
 

diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h
index d6dd8052cd6f199f5775486ba416c7c2075c2d74..131a0cb0f491833f8fc3413a024aecfc5c3404d1 100644 (file)
--- a/include/asm-m68k/system.h
+++ b/include/asm-m68k/system.h
@@ -80,7 +80,6 @@ static inline int irqs_disabled(void)
 #define wmb()          barrier()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)    do { xchg(&var, value); } while (0)
 #define wmb()          barrier()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)    do { xchg(&var, value); } while (0)

-#define set_wmb(var, value)    do { var = value; wmb(); } while (0)

 
 #define smp_mb()       barrier()
 #define smp_rmb()      barrier()
 
 #define smp_mb()       barrier()
 #define smp_rmb()      barrier()

diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h
index 2bbe2db00a22a7a3c1731ea0b574558580027fc0..2a814498672d72408c149f4d64580232f697c5df 100644 (file)
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
@@ -106,7 +106,6 @@ asmlinkage void resume(void);
 #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 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_wmb(var, value)    do { var = value; wmb(); } while (0)

 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()

diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 13c98dde82dcd8a2142666d34d7cce2ed022c24f..dcb4701d572831fe8e7f781d364bd4a524f2b39c 100644 (file)
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -143,9 +143,6 @@
 #define set_mb(var, value) \
 do { var = value; mb(); } while (0)
 
 #define set_mb(var, value) \
 do { var = value; mb(); } while (0)
 

-#define set_wmb(var, value) \
-do { var = value; wmb(); } while (0)
-

 /*
  * switch_to(n) should switch tasks to task nr n, first
  * checking that n isn't the current task, in which case it does nothing.
 /*
  * switch_to(n) should switch tasks to task nr n, first
  * checking that n isn't the current task, in which case it does nothing.

diff --git a/include/asm-parisc/system.h b/include/asm-parisc/system.h
index 5fe2d2329ab5e7c7dbd8121351b1ea7fcef54dbc..74f037a39e6f032ce6a76ae974d521f6357d1f6e 100644 (file)
--- a/include/asm-parisc/system.h
+++ b/include/asm-parisc/system.h
@@ -143,8 +143,6 @@ static inline void set_eiem(unsigned long val)
 #define read_barrier_depends()         do { } while(0)
 
 #define set_mb(var, value)             do { var = value; mb(); } while (0)
 #define read_barrier_depends()         do { } while(0)
 
 #define set_mb(var, value)             do { var = value; mb(); } while (0)

-#define set_wmb(var, value)            do { var = value; wmb(); } while (0)
-

 
 #ifndef CONFIG_PA20
 /* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data,
 
 #ifndef CONFIG_PA20
 /* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data,

diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index c6569516ba3536269d03a38c5a18ae4029eaf480..7307aa775671e415c69829cdbb5aaac35f8dca5d 100644 (file)
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -39,7 +39,6 @@
 #define read_barrier_depends()  do { } while(0)
 
 #define set_mb(var, value)     do { var = value; mb(); } while (0)
 #define read_barrier_depends()  do { } while(0)
 
 #define set_mb(var, value)     do { var = value; mb(); } while (0)

-#define set_wmb(var, value)    do { var = value; wmb(); } while (0)

 
 #ifdef __KERNEL__
 #ifdef CONFIG_SMP
 
 #ifdef __KERNEL__
 #ifdef CONFIG_SMP

diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index fb49c0c49ea1078fdea6df52b55dd09a71c302dd..738943584c017547b765998214cdecb4db235397 100644 (file)
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -33,7 +33,6 @@
 #define read_barrier_depends()  do { } while(0)
 
 #define set_mb(var, value)     do { var = value; mb(); } while (0)
 #define read_barrier_depends()  do { } while(0)
 
 #define set_mb(var, value)     do { var = value; mb(); } while (0)

-#define set_wmb(var, value)    do { var = value; wmb(); } while (0)

 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()

diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index 9ab186ffde23e2009511bb132cd96909df1a0457..36a3a85d611ab1d3b876f86940f0129a10c35931 100644 (file)
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -299,7 +299,6 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 
 
 #define set_mb(var, value)      do { var = value; mb(); } while (0)
 
 
 #define set_mb(var, value)      do { var = value; mb(); } while (0)

-#define set_wmb(var, value)     do { var = value; wmb(); } while (0)

 
 #ifdef __s390x__
 
 
 #ifdef __s390x__
 

diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index ce2e60664a86750ec1c07e84bc4765b3eafa95e7..ad35ad4958f44df04d7abda10e132c92d707e8bd 100644 (file)
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -101,7 +101,6 @@ extern void __xchg_called_with_bad_pointer(void);
 #endif
 
 #define set_mb(var, value) do { xchg(&var, value); } while (0)
 #endif
 
 #define set_mb(var, value) do { xchg(&var, value); } while (0)

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)

 
 /* Interrupt Control */
 static __inline__ void local_irq_enable(void)
 
 /* Interrupt Control */
 static __inline__ void local_irq_enable(void)

diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
index 7606f6e1f01ed9b6c253b245d3b1b599d73ff477..87ef6f1ad5a47f5e2df6f941439ff30d5a113eb8 100644 (file)
--- a/include/asm-sh64/system.h
+++ b/include/asm-sh64/system.h
@@ -66,7 +66,6 @@ extern void __xchg_called_with_bad_pointer(void);
 
 #define set_rmb(var, value) do { xchg(&var, value); } while (0)
 #define set_mb(var, value) set_rmb(var, value)
 
 #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)

 
 /* Interrupt Control */
 #ifndef HARD_CLI
 
 /* Interrupt Control */
 #ifndef HARD_CLI

diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index cb7dda1e5e91fe93a853d60b382e74e723ae155a..100c3eaf3c1fe439713ccedab0ea8c0e87459067 100644 (file)
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -199,7 +199,6 @@ static inline unsigned long getipl(void)
 #define wmb()  mb()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(__var, __value)  do { __var = __value; mb(); } while(0)
 #define wmb()  mb()
 #define read_barrier_depends() do { } while(0)
 #define set_mb(__var, __value)  do { __var = __value; mb(); } while(0)

-#define set_wmb(__var, __value) set_mb(__var, __value)

 #define smp_mb()       __asm__ __volatile__("":::"memory")
 #define smp_rmb()      __asm__ __volatile__("":::"memory")
 #define smp_wmb()      __asm__ __volatile__("":::"memory")
 #define smp_mb()       __asm__ __volatile__("":::"memory")
 #define smp_rmb()      __asm__ __volatile__("":::"memory")
 #define smp_wmb()      __asm__ __volatile__("":::"memory")

diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
index 4ca68600c670413315b17bca7428778aa707fb95..a8b7432c9a70825f3b7d0c6e3b02f3772c24673c 100644 (file)
--- a/include/asm-sparc64/system.h
+++ b/include/asm-sparc64/system.h
@@ -123,8 +123,6 @@ do {        __asm__ __volatile__("ba,pt     %%xcc, 1f\n\t" \
 #define read_barrier_depends()         do { } while(0)
 #define set_mb(__var, __value) \
        do { __var = __value; membar_storeload_storestore(); } while(0)
 #define read_barrier_depends()         do { } while(0)
 #define set_mb(__var, __value) \
        do { __var = __value; membar_storeload_storestore(); } while(0)

-#define set_wmb(__var, __value) \
-       do { __var = __value; wmb(); } while(0)

 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
 
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()

diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h
index 7091af4b786677ca176f08d01127cc6f69361185..da39916f10b0cc523eb2c0907f8579b5445fdc41 100644 (file)
--- a/include/asm-v850/system.h
+++ b/include/asm-v850/system.h
@@ -68,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 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 ()
 
 #define smp_mb()       mb ()
 #define smp_rmb()      rmb ()

diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h
index f67f2873a9225281b98818102ce0cd1ba5cf45b2..6bf170bceae1b4a7d114305c340240670698a032 100644 (file)
--- a/include/asm-x86_64/system.h
+++ b/include/asm-x86_64/system.h
@@ -240,7 +240,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 #endif
 #define read_barrier_depends() do {} while(0)
 #define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #endif
 #define read_barrier_depends() do {} while(0)
 #define set_mb(var, value) do { (void) xchg(&var, value); } while (0)

-#define set_wmb(var, value) do { var = value; wmb(); } while (0)

 
 #define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0)
 
 
 #define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0)
 

diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h
index f986170bd2a15416c5e6e94ec686f11fbb975c09..932bda92a21c392b609e67eb09608897d4259657 100644 (file)
--- a/include/asm-xtensa/system.h
+++ b/include/asm-xtensa/system.h
@@ -99,7 +99,6 @@ static inline void disable_coprocessor(int i)
 #endif
 
 #define set_mb(var, value)     do { var = value; mb(); } 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)

 
 #if !defined (__ASSEMBLY__)
 
 
 #if !defined (__ASSEMBLY__)