Merge commit 'v2.6.39-rc6' into x86/cleanups

[pandora-kernel.git] / arch / frv / include / asm / system.h

diff --git a/arch/frv/include/asm/system.h b/arch/frv/include/asm/system.h
index 0a6d8d9..6c10fd2 100644 (file)
--- a/arch/frv/include/asm/system.h
+++ b/arch/frv/include/asm/system.h
@@ -45,21 +45,12 @@ do {                                                                        \
 #define wmb()                  asm volatile ("membar" : : :"memory")
 #define read_barrier_depends() do { } while (0)
 
-#ifdef CONFIG_SMP
-#define smp_mb()                       mb()
-#define smp_rmb()                      rmb()
-#define smp_wmb()                      wmb()
-#define smp_read_barrier_depends()     read_barrier_depends()
-#define set_mb(var, value) \
-       do { xchg(&var, (value)); } while (0)
-#else
 #define smp_mb()                       barrier()
 #define smp_rmb()                      barrier()
 #define smp_wmb()                      barrier()
 #define smp_read_barrier_depends()     do {} while(0)
 #define set_mb(var, value) \
        do { var = (value); barrier(); } while (0)
-#endif
 
 extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2)));
 extern void free_initmem(void);