Merge with /home/shaggy/git/linus-clean/

[linux-2.6] / include / asm-arm / ptrace.h

diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 604e3a186cf9b7e5e32b8abcd17d557c5e990cc9..4377e22b7e1a9a7359d1e6255e4098b1227e7aa2 100644 (file)
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -142,11 +142,8 @@ extern unsigned long profile_pc(struct pt_regs *regs);
 #endif
 
 #ifdef __KERNEL__
-extern void show_regs(struct pt_regs *);
-
-#define predicate(x)   (x & 0xf0000000)
+#define predicate(x)           ((x) & 0xf0000000)
 #define PREDICATE_ALWAYS       0xe0000000
-
 #endif
 
 #endif /* __ASSEMBLY__ */