From b2fff3f1b52989dae8dfc76d0a093967c3b75d06 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 20 Oct 2007 02:30:47 +0200 Subject: [PATCH] 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 Acked-by: Paul Mundt Acked-by: Greg Ungerer Signed-off-by: Adrian Bunk --- include/asm-blackfin/system.h | 4 +--- include/asm-h8300/system.h | 3 +-- include/asm-m68knommu/system.h | 3 +-- include/asm-sh64/system.h | 3 +-- include/asm-v850/system.h | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/asm-blackfin/system.h b/include/asm-blackfin/system.h index 2b3d47d0bb..4a927379ee 100644 --- 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 7807018f85..2c1e83f7b4 100644 --- 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 1bd1142685..15b4c7d45c 100644 --- 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 5ff94644e8..be2a15ffcc 100644 --- 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 0de2481fd9..a34ddfafd5 100644 --- 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 () -- 2.39.5