X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-frv%2Fsystem.h;h=d3a12a9079f78f672615c3b5a31ed1bb7921e37f;hb=551395ae667d699189014f762355e9131fc03e79;hp=30a67a9da11ae88f7754bb09512940204787ba7d;hpb=2a467d5f7d6bdc90c365db167a10022dd8351894;p=linux-2.6

diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index 30a67a9da1..d3a12a9079 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -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);