--- 2.4.0-test5-set_rmb/include/asm-i386/system.h.~1~	Fri Jul 14 18:47:05 2000
+++ 2.4.0-test5-set_rmb/include/asm-i386/system.h	Fri Jul 28 14:28:37 2000
@@ -271,8 +271,7 @@
 #define mb() 	__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
 #define rmb()	mb()
 #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)
 #define set_wmb(var, value) do { var = value; wmb(); } while (0)
 
 /* interrupt control.. */
--- 2.4.0-test5-set_rmb/include/asm-ia64/system.h.~1~	Sat Jun 24 16:03:00 2000
+++ 2.4.0-test5-set_rmb/include/asm-ia64/system.h	Fri Jul 28 14:28:54 2000
@@ -96,7 +96,6 @@
  * Linus just yet.  Grrr...
  */
 #define set_mb(var, value)	do { (var) = (value); mb(); } while (0)
-#define set_rmb(var, value)	do { (var) = (value); mb(); } while (0)
 #define set_wmb(var, value)	do { (var) = (value); mb(); } while (0)
 
 /*
--- 2.4.0-test5-set_rmb/include/asm-m68k/system.h.~1~	Sun Jan 30 15:43:39 2000
+++ 2.4.0-test5-set_rmb/include/asm-m68k/system.h	Fri Jul 28 14:29:04 2000
@@ -80,8 +80,7 @@
 #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)
 #define set_wmb(var, value)    do { var = value; wmb(); } while (0)
 
 
--- 2.4.0-test5-set_rmb/include/asm-mips/system.h.~1~	Tue Jul 11 03:50:37 2000
+++ 2.4.0-test5-set_rmb/include/asm-mips/system.h	Fri Jul 28 14:29:12 2000
@@ -153,9 +153,6 @@
 #define set_mb(var, value) \
 do { var = value; mb(); } while (0)
 
-#define set_rmb(var, value) \
-do { var = value; rmb(); } while (0)
-
 #define set_wmb(var, value) \
 do { var = value; wmb(); } while (0)
 
--- 2.4.0-test5-set_rmb/include/asm-mips64/system.h.~1~	Sat May 27 07:47:07 2000
+++ 2.4.0-test5-set_rmb/include/asm-mips64/system.h	Fri Jul 28 14:29:17 2000
@@ -154,9 +154,6 @@
 #define set_mb(var, value) \
 do { var = value; mb(); } while (0)
 
-#define set_rmb(var, value) \
-do { var = value; rmb(); } while (0)
-
 #define set_wmb(var, value) \
 do { var = value; wmb(); } while (0)
 
--- 2.4.0-test5-set_rmb/include/asm-ppc/system.h.~1~	Sat Jun 24 16:03:01 2000
+++ 2.4.0-test5-set_rmb/include/asm-ppc/system.h	Fri Jul 28 14:29:21 2000
@@ -34,7 +34,6 @@
 #define wmb()  __asm__ __volatile__ ("eieio" : : : "memory")
 
 #define set_mb(var, value)	do { var = value; mb(); } while (0)
-#define set_rmb(var, value)	do { var = value; rmb(); } while (0)
 #define set_wmb(var, value)	do { var = value; wmb(); } while (0)
 
 extern void xmon_irq(int, void *, struct pt_regs *);
--- 2.4.0-test5-set_rmb/include/asm-s390/system.h.~1~	Sat May 13 19:15:20 2000
+++ 2.4.0-test5-set_rmb/include/asm-s390/system.h	Fri Jul 28 14:29:49 2000
@@ -117,7 +117,6 @@
 #define wmb()   eieio()
 
 #define set_mb(var, value)      do { var = value; mb(); } while (0)
-#define set_rmb(var, value)     do { var = value; rmb(); } while (0)
 #define set_wmb(var, value)     do { var = value; wmb(); } while (0)
 
 /* interrupt control.. */
--- 2.4.0-test5-set_rmb/include/asm-sh/system.h.~1~	Sat May 27 07:47:08 2000
+++ 2.4.0-test5-set_rmb/include/asm-sh/system.h	Fri Jul 28 14:30:46 2000
@@ -88,8 +88,7 @@
 #define mb()	__asm__ __volatile__ ("": : :"memory")
 #define rmb()	mb()
 #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)
 #define set_wmb(var, value) do { var = value; wmb(); } while (0)
 
 /* Interrupt Control */
--- 2.4.0-test5-set_rmb/include/asm-sparc/system.h.~1~	Sat May 27 07:47:08 2000
+++ 2.4.0-test5-set_rmb/include/asm-sparc/system.h	Fri Jul 28 14:30:57 2000
@@ -279,7 +279,6 @@
 #define rmb()	mb()
 #define wmb()	mb()
 #define set_mb(__var, __value)  do { __var = __value; mb(); } while(0)
-#define set_rmb(__var, __value) set_mb(__var, __value)
 #define set_wmb(__var, __value) set_mb(__var, __value)
 
 #define nop() __asm__ __volatile__ ("nop");
--- 2.4.0-test5-set_rmb/include/asm-sparc64/system.h.~1~	Sat Jun 24 16:03:02 2000
+++ 2.4.0-test5-set_rmb/include/asm-sparc64/system.h	Fri Jul 28 14:31:02 2000
@@ -104,8 +104,6 @@
 #define wmb()		membar("#StoreLoad | #StoreStore")
 #define set_mb(__var, __value) \
 	do { __var = __value; membar("#StoreLoad | #StoreStore"); } while(0)
-#define set_rmb(__var, __value) \
-	do { __var = __value; membar("#StoreLoad"); } while(0)
 #define set_wmb(__var, __value) \
 	do { __var = __value; membar("#StoreStore"); } while(0)