diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-02-10 04:44:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:24 -0500 |
commit | 6e6d74cfac782a3a4cb5111bd9c25cd95d6b7c6c (patch) | |
tree | f63c0433740168f56916ece27793e9b69a40e072 /arch/um/sys-x86_64/ptrace.c | |
parent | f355559cf78455ed6be103b020e4b800230c64eb (diff) |
[PATCH] uml: x86_64 ptrace fixes
This patch fixes some missing ptrace bits on x86_64. PTRACE_ARCH_PRCTL is
hooked up and implemented. This required generalizing arch_prctl_skas
slightly to take a task_struct to modify. Previously, it always operated on
current.
Reading and writing the debug registers is also enabled by un-ifdefing the
code that implements that. It turns out that x86_64 is identical to i386, so
the same code can be used.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/sys-x86_64/ptrace.c')
-rw-r--r-- | arch/um/sys-x86_64/ptrace.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/um/sys-x86_64/ptrace.c b/arch/um/sys-x86_64/ptrace.c index 147bbf05cbc2..55b66e09a98c 100644 --- a/arch/um/sys-x86_64/ptrace.c +++ b/arch/um/sys-x86_64/ptrace.c | |||
@@ -71,8 +71,6 @@ int poke_user(struct task_struct *child, long addr, long data) | |||
71 | 71 | ||
72 | if (addr < MAX_REG_OFFSET) | 72 | if (addr < MAX_REG_OFFSET) |
73 | return putreg(child, addr, data); | 73 | return putreg(child, addr, data); |
74 | |||
75 | #if 0 /* Need x86_64 debugregs handling */ | ||
76 | else if((addr >= offsetof(struct user, u_debugreg[0])) && | 74 | else if((addr >= offsetof(struct user, u_debugreg[0])) && |
77 | (addr <= offsetof(struct user, u_debugreg[7]))){ | 75 | (addr <= offsetof(struct user, u_debugreg[7]))){ |
78 | addr -= offsetof(struct user, u_debugreg[0]); | 76 | addr -= offsetof(struct user, u_debugreg[0]); |
@@ -81,7 +79,6 @@ int poke_user(struct task_struct *child, long addr, long data) | |||
81 | child->thread.arch.debugregs[addr] = data; | 79 | child->thread.arch.debugregs[addr] = data; |
82 | return 0; | 80 | return 0; |
83 | } | 81 | } |
84 | #endif | ||
85 | return -EIO; | 82 | return -EIO; |
86 | } | 83 | } |
87 | 84 | ||
@@ -119,14 +116,12 @@ int peek_user(struct task_struct *child, long addr, long data) | |||
119 | if(addr < MAX_REG_OFFSET){ | 116 | if(addr < MAX_REG_OFFSET){ |
120 | tmp = getreg(child, addr); | 117 | tmp = getreg(child, addr); |
121 | } | 118 | } |
122 | #if 0 /* Need x86_64 debugregs handling */ | ||
123 | else if((addr >= offsetof(struct user, u_debugreg[0])) && | 119 | else if((addr >= offsetof(struct user, u_debugreg[0])) && |
124 | (addr <= offsetof(struct user, u_debugreg[7]))){ | 120 | (addr <= offsetof(struct user, u_debugreg[7]))){ |
125 | addr -= offsetof(struct user, u_debugreg[0]); | 121 | addr -= offsetof(struct user, u_debugreg[0]); |
126 | addr = addr >> 2; | 122 | addr = addr >> 2; |
127 | tmp = child->thread.arch.debugregs[addr]; | 123 | tmp = child->thread.arch.debugregs[addr]; |
128 | } | 124 | } |
129 | #endif | ||
130 | return put_user(tmp, (unsigned long *) data); | 125 | return put_user(tmp, (unsigned long *) data); |
131 | } | 126 | } |
132 | 127 | ||