diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-18 17:47:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:21 -0700 |
| commit | 17dcf75d3ea11d7e26110ba85677cfadbccecf45 (patch) | |
| tree | 7a6448eb48458d2fa0f05b94052be0a19eafe11f /arch/um/include | |
| parent | 2985cfdb04002b8e4c003a4008b2580aaebf75fc (diff) | |
x86, um: trim the junk from uml ptrace-*.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/asm/ptrace-i386.h | 4 | ||||
| -rw-r--r-- | arch/um/include/asm/ptrace-x86_64.h | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/arch/um/include/asm/ptrace-i386.h b/arch/um/include/asm/ptrace-i386.h index b2d24c5ea2c3..0273e4d09af7 100644 --- a/arch/um/include/asm/ptrace-i386.h +++ b/arch/um/include/asm/ptrace-i386.h @@ -10,8 +10,6 @@ #include "linux/compiler.h" #include "asm/ptrace-generic.h" -#include <asm/user.h> -#include "sysdep/ptrace.h" #define PT_REGS_EAX(r) UPT_EAX(&(r)->regs) #define PT_REGS_EBX(r) UPT_EBX(&(r)->regs) @@ -34,8 +32,6 @@ #define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r) #define PT_FIX_EXEC_STACK(sp) do ; while(0) -/* Cope with a conditional i386 definition. */ -#undef profile_pc #define profile_pc(regs) PT_REGS_IP(regs) #define user_mode(r) UPT_IS_USER(&(r)->regs) diff --git a/arch/um/include/asm/ptrace-x86_64.h b/arch/um/include/asm/ptrace-x86_64.h index 2653fbaa352e..83d8c473b905 100644 --- a/arch/um/include/asm/ptrace-x86_64.h +++ b/arch/um/include/asm/ptrace-x86_64.h @@ -9,23 +9,12 @@ #include "linux/compiler.h" #include "asm/errno.h" -#include <sysdep/host_ldt.h> #define __FRAME_OFFSETS /* Needed to get the R* macros */ #include "asm/ptrace-generic.h" #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 -/* Also defined in sysdep/ptrace.h, so may already be defined. */ -#ifndef FS_BASE -#define FS_BASE (21 * sizeof(unsigned long)) -#define GS_BASE (22 * sizeof(unsigned long)) -#define DS (23 * sizeof(unsigned long)) -#define ES (24 * sizeof(unsigned long)) -#define FS (25 * sizeof(unsigned long)) -#define GS (26 * sizeof(unsigned long)) -#endif - #define PT_REGS_RBX(r) UPT_RBX(&(r)->regs) #define PT_REGS_RCX(r) UPT_RCX(&(r)->regs) #define PT_REGS_RDX(r) UPT_RDX(&(r)->regs) @@ -64,6 +53,8 @@ #define profile_pc(regs) PT_REGS_IP(regs) +struct user_desc; + static inline int ptrace_get_thread_area(struct task_struct *child, int idx, struct user_desc __user *user_desc) { |