[PATCH] New ptrace.h definitions

ARM added a definition for PT_SINGLESTEP which conflicted with
our definition.  So define PT_SINGLESTEP_BIT, PT_BLOCKSTEP_BIT and
PT_BLOCKSTEP to prevent similar problems in the future.  (James Bottomley)

diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 91a309f8a0a17ef5c287c7d104d60fce2164b3b7..53132cd80429e69acec2c7c9f284ce21e0be9f41 100644 (file)
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -65,7 +65,12 @@
 #define PT_TRACE_EXIT  0x00000200
 
 #define PT_TRACE_MASK  0x000003f4
-#define PT_SINGLESTEP  0x80000000      /* single stepping (used on ARM) */
+
+/* single stepping state bits (used on ARM and PA-RISC) */
+#define PT_SINGLESTEP_BIT      31
+#define PT_SINGLESTEP          (1<<PT_SINGLESTEP_BIT)
+#define PT_BLOCKSTEP_BIT       30
+#define PT_BLOCKSTEP           (1<<PT_BLOCKSTEP_BIT)
 
 #include <linux/compiler.h>            /* For unlikely.  */
 #include <linux/sched.h>               /* For struct task_struct.  */