Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 604e3a186cf9b7e5e32b8abcd17d557c5e990cc9..77adb7fa169bb291368589f4fc206821f2988707 100644 (file)
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -23,6 +23,9 @@
 #define PTRACE_OLDSETOPTIONS   21
 
 #define PTRACE_GET_THREAD_AREA 22
+
+#define PTRACE_SET_SYSCALL     23
+
 /*
  * PSR bits
  */
@@ -60,9 +63,11 @@
 
 #ifndef __ASSEMBLY__
 
-/* this struct defines the way the registers are stored on the
-   stack during a system call. */
-
+/*
+ * This struct defines the way the registers are stored on the
+ * stack during a system call.  Note that sizeof(struct pt_regs)
+ * has to be a multiple of 8.
+ */
 struct pt_regs {
        long uregs[18];
 };
@@ -142,11 +147,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__ */