--- linux/arch/um/include/skas_ptrace.h.orig +++ linux/arch/um/include/skas_ptrace.h @@ -6,6 +6,10 @@ #ifndef __SKAS_PTRACE_H #define __SKAS_PTRACE_H + +#ifndef _LINUX_PTRACE_STRUCT_DEF +#define _LINUX_PTRACE_STRUCT_DEF + struct ptrace_faultinfo { int is_write; unsigned long addr; @@ -17,6 +21,8 @@ struct ptrace_ldt { unsigned long bytecount; }; +#endif + #define PTRACE_FAULTINFO 52 #define PTRACE_SIGPENDING 53 #define PTRACE_LDT 54 --- ./include/asm-i386/ptrace.h.unif_compile 2003-12-26 16:45:36.000000000 +0100 +++ ./include/asm-i386/ptrace.h 2003-12-27 21:05:12.000000000 +0100 @@ -60,6 +60,9 @@ #endif /*For SKAS3 support.*/ +#ifndef _LINUX_PTRACE_STRUCT_DEF +#define _LINUX_PTRACE_STRUCT_DEF + #define PTRACE_FAULTINFO 52 #define PTRACE_SIGPENDING 53 #define PTRACE_LDT 54 @@ -76,4 +79,6 @@ unsigned long bytecount; }; +#endif /*ifndef _LINUX_PTRACE_STRUCT_DEF*/ + #endif