From: Jeff Dike Include the host architecture's ptrace-abi.h instead of ptrace.h. There was some cpp mangling of names around the ptrace.h include to avoid symbol clashes between UML and the host architecture. Most of these can go away. The exception is struct pt_regs, which is convenient to have in userspace, but must be renamed in order that UML can define its own. Signed-off-by: Jeff Dike Cc: Chuck Ebbert <76306.1226@compuserve.com> Cc: Zachary Amsden Cc: Rusty Russell Cc: Andi Kleen Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton --- include/asm-um/ptrace-generic.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff -puN include/asm-um/ptrace-generic.h~uml-use-ptrace-abih-instead-of-ptraceh include/asm-um/ptrace-generic.h --- a/include/asm-um/ptrace-generic.h~uml-use-ptrace-abih-instead-of-ptraceh +++ a/include/asm-um/ptrace-generic.h @@ -8,18 +8,9 @@ #ifndef __ASSEMBLY__ - #define pt_regs pt_regs_subarch -#define show_regs show_regs_subarch -#define send_sigtrap send_sigtrap_subarch - -#include "asm/arch/ptrace.h" - +#include "asm/arch/ptrace-abi.h" #undef pt_regs -#undef show_regs -#undef send_sigtrap -#undef user_mode -#undef instruction_pointer #include "sysdep/ptrace.h" _