[PATCH] PTRACE_SYSEMU: declare only for i386 and avoid clashes

From: Paolo 'Blaisorblade' Giarrusso
Date: Mon Dec 26 2005 - 16:08:07 EST



From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>

PTRACE_SYSEMU{,_SINGLESTEP} is actually i386-specific, for now, and the current
allocated number clashes with a ptrace code of frv, i.e. PTRACE_GETFDPIC. So,
make the declaration local to i386 headers. When we'll port this to other archs,
we'll use a better value for the constant (from the arch-independent range).

I should have submitted this much earlier, anyway we get no breakage for the
delay.

CC: Daniel Jacobowitz <dan@xxxxxxxxxx>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
---

include/asm-i386/ptrace.h | 3 +++
include/linux/ptrace.h | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/asm-i386/ptrace.h b/include/asm-i386/ptrace.h
index 7e0f294..f324c53 100644
--- a/include/asm-i386/ptrace.h
+++ b/include/asm-i386/ptrace.h
@@ -54,6 +54,9 @@ struct pt_regs {
#define PTRACE_GET_THREAD_AREA 25
#define PTRACE_SET_THREAD_AREA 26

+#define PTRACE_SYSEMU 31
+#define PTRACE_SYSEMU_SINGLESTEP 32
+
#ifdef __KERNEL__

#include <asm/vm86.h>
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index b2b3dba..8b64478 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -20,8 +20,6 @@
#define PTRACE_DETACH 0x11

#define PTRACE_SYSCALL 24
-#define PTRACE_SYSEMU 31
-#define PTRACE_SYSEMU_SINGLESTEP 32

/* 0x4200-0x4300 are reserved for architecture-independent additions. */
#define PTRACE_SETOPTIONS 0x4200

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/