diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-09-26 06:33:10 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 15:49:10 (GMT) |
commit | e8df8c3304cfc7d68e9a6a7b6df6c64783cd6991 (patch) | |
tree | 19430fa49f774ebeaa7cf8d5d40c58600ad79bf5 /include/asm-um/ptrace-generic.h | |
parent | 70e0eb8ef143f3729065c504177413ffe165af22 (diff) | |
download | linux-fsl-qoriq-e8df8c3304cfc7d68e9a6a7b6df6c64783cd6991.tar.xz |
[PATCH] Make UML use ptrace-abi.h
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.
ptrace-x86_64.h needed to have some now-obsolete cpp cruft and a declaration
removed.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um/ptrace-generic.h')
-rw-r--r-- | include/asm-um/ptrace-generic.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/asm-um/ptrace-generic.h b/include/asm-um/ptrace-generic.h index a36f537..99c87c5 100644 --- a/include/asm-um/ptrace-generic.h +++ b/include/asm-um/ptrace-generic.h @@ -8,19 +8,7 @@ #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" - -#undef pt_regs -#undef show_regs -#undef send_sigtrap -#undef user_mode -#undef instruction_pointer - +#include "asm/arch/ptrace-abi.h" #include "sysdep/ptrace.h" struct pt_regs { |