aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/ptrace-i386.h4
-rw-r--r--arch/um/include/asm/ptrace-x86_64.h13
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 @@
10 10
11#include "linux/compiler.h" 11#include "linux/compiler.h"
12#include "asm/ptrace-generic.h" 12#include "asm/ptrace-generic.h"
13#include <asm/user.h>
14#include "sysdep/ptrace.h"
15 13
16#define PT_REGS_EAX(r) UPT_EAX(&(r)->regs) 14#define PT_REGS_EAX(r) UPT_EAX(&(r)->regs)
17#define PT_REGS_EBX(r) UPT_EBX(&(r)->regs) 15#define PT_REGS_EBX(r) UPT_EBX(&(r)->regs)
@@ -34,8 +32,6 @@
34#define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r) 32#define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r)
35#define PT_FIX_EXEC_STACK(sp) do ; while(0) 33#define PT_FIX_EXEC_STACK(sp) do ; while(0)
36 34
37/* Cope with a conditional i386 definition. */
38#undef profile_pc
39#define profile_pc(regs) PT_REGS_IP(regs) 35#define profile_pc(regs) PT_REGS_IP(regs)
40 36
41#define user_mode(r) UPT_IS_USER(&(r)->regs) 37#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 @@
9 9
10#include "linux/compiler.h" 10#include "linux/compiler.h"
11#include "asm/errno.h" 11#include "asm/errno.h"
12#include <sysdep/host_ldt.h>
13 12
14#define __FRAME_OFFSETS /* Needed to get the R* macros */ 13#define __FRAME_OFFSETS /* Needed to get the R* macros */
15#include "asm/ptrace-generic.h" 14#include "asm/ptrace-generic.h"
16 15
17#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 16#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
18 17
19/* Also defined in sysdep/ptrace.h, so may already be defined. */
20#ifndef FS_BASE
21#define FS_BASE (21 * sizeof(unsigned long))
22#define GS_BASE (22 * sizeof(unsigned long))
23#define DS (23 * sizeof(unsigned long))
24#define ES (24 * sizeof(unsigned long))
25#define FS (25 * sizeof(unsigned long))
26#define GS (26 * sizeof(unsigned long))
27#endif
28
29#define PT_REGS_RBX(r) UPT_RBX(&(r)->regs) 18#define PT_REGS_RBX(r) UPT_RBX(&(r)->regs)
30#define PT_REGS_RCX(r) UPT_RCX(&(r)->regs) 19#define PT_REGS_RCX(r) UPT_RCX(&(r)->regs)
31#define PT_REGS_RDX(r) UPT_RDX(&(r)->regs) 20#define PT_REGS_RDX(r) UPT_RDX(&(r)->regs)
@@ -64,6 +53,8 @@
64 53
65#define profile_pc(regs) PT_REGS_IP(regs) 54#define profile_pc(regs) PT_REGS_IP(regs)
66 55
56struct user_desc;
57
67static inline int ptrace_get_thread_area(struct task_struct *child, int idx, 58static inline int ptrace_get_thread_area(struct task_struct *child, int idx,
68 struct user_desc __user *user_desc) 59 struct user_desc __user *user_desc)
69{ 60{