[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)

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.  */