Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / include / asm-frv / system.h

diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index 30a67a9da11ae88f7754bb09512940204787ba7d..7742ec000cc474d018c6378705395ce9e0b43688 100644 (file)
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -87,7 +87,7 @@ do {                                                          \
 } while(0)
 
 #define irqs_disabled() \
-       ({unsigned long flags; local_save_flags(flags); flags; })
+       ({unsigned long flags; local_save_flags(flags); !!flags; })
 
 #define        local_irq_save(flags)                   \
 do {                                           \
@@ -179,7 +179,7 @@ do {                                                        \
 #define mb()                   asm volatile ("membar" : : :"memory")
 #define rmb()                  asm volatile ("membar" : : :"memory")
 #define wmb()                  asm volatile ("membar" : : :"memory")
-#define read_barrier_depends() barrier()
+#define read_barrier_depends() do { } while (0)
 
 #ifdef CONFIG_SMP
 #define smp_mb()                       mb()
@@ -197,11 +197,6 @@ do {                                                       \
        do { var = (value); barrier(); } while (0)
 #endif
 
-#define HARD_RESET_NOW()                       \
-do {                                           \
-       cli();                                  \
-} while(1)
-
 extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2)));
 extern void free_initmem(void);