From: Paolo 'Blaisorblade' Giarrusso PTRACE_SYSEMU{,_SINGLESTEP} is actually arch specific, for now, and the current allocated number clashes with a ptrace code of frv, i.e. PTRACE_GETFDPIC. I should have submitted this much earlier, anyway we get no breakage for this. CC: Daniel Jacobowitz Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton --- include/asm-i386/ptrace.h | 3 +++ include/linux/ptrace.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff -puN include/asm-i386/ptrace.h~ptrace_sysemu-is-only-for-i386-and-clashes-with-other-ptrace-codes-of-other-archs include/asm-i386/ptrace.h --- devel/include/asm-i386/ptrace.h~ptrace_sysemu-is-only-for-i386-and-clashes-with-other-ptrace-codes-of-other-archs 2006-01-03 17:17:18.000000000 -0800 +++ devel-akpm/include/asm-i386/ptrace.h 2006-01-03 17:17:18.000000000 -0800 @@ -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 diff -puN include/linux/ptrace.h~ptrace_sysemu-is-only-for-i386-and-clashes-with-other-ptrace-codes-of-other-archs include/linux/ptrace.h --- devel/include/linux/ptrace.h~ptrace_sysemu-is-only-for-i386-and-clashes-with-other-ptrace-codes-of-other-archs 2006-01-03 17:17:18.000000000 -0800 +++ devel-akpm/include/linux/ptrace.h 2006-01-03 17:17:18.000000000 -0800 @@ -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 _