Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[karo-tx-linux.git] / include / asm-sh64 / system.h

diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
index 42510e496eb528f10894343e3b0dc3387f396255..b1598c26fcb088fe06d809540f7f90c3adde171d 100644 (file)
--- a/include/asm-sh64/system.h
+++ b/include/asm-sh64/system.h
@@ -14,7 +14,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <asm/registers.h>
 #include <asm/processor.h>
 
@@ -65,9 +64,8 @@ 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 { xchg(&var, value); } while (0)
+#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)
 
 /* Interrupt Control */
 #ifndef HARD_CLI
@@ -132,7 +130,7 @@ static __inline__ void local_irq_disable(void)
        (flags != 0);                   \
 })
 
-extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
+static inline unsigned long xchg_u32(volatile int * m, unsigned long val)
 {
        unsigned long flags, retval;
 
@@ -143,7 +141,7 @@ extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
        return retval;
 }
 
-extern __inline__ unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
+static inline unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
 {
        unsigned long flags, retval;