aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-09-14 19:21:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-14 21:09:37 -0400
commit01599cdc2f891415387aed9921909b3e9f27c801 (patch)
treea5692896be04c80940093f644a86f5e11f1d749b
parent7cf3cf21aac7d75d27e8e7cd039bd33d19fb300d (diff)
um: PTRACE_[GS]ETFPXREGS had been wired on the wrong subarch
It's 32bit-only, not 64bit-only... And while we are at it, it's set_fpxregs(), not set_fpregs()... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/um/sys-i386/ptrace.c14
-rw-r--r--arch/um/sys-x86_64/ptrace.c14
2 files changed, 14 insertions, 14 deletions
diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c
index d23b2d3ea384..49fd25a5f206 100644
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
@@ -206,5 +206,17 @@ int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
206long subarch_ptrace(struct task_struct *child, long request, 206long subarch_ptrace(struct task_struct *child, long request,
207 unsigned long addr, unsigned long data) 207 unsigned long addr, unsigned long data)
208{ 208{
209 return -EIO; 209 int ret = -EIO;
210 void __user *datap = (void __user *) data;
211
212 switch (request) {
213 case PTRACE_GETFPXREGS: /* Get the child FPU state. */
214 ret = get_fpxregs(datap, child);
215 break;
216 case PTRACE_SETFPXREGS: /* Set the child FPU state. */
217 ret = set_fpxregs(datap, child);
218 break;
219 }
220
221 return ret;
210} 222}
diff --git a/arch/um/sys-x86_64/ptrace.c b/arch/um/sys-x86_64/ptrace.c
index f43613643cdb..7ed49ac78f88 100644
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
@@ -178,17 +178,5 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
178long subarch_ptrace(struct task_struct *child, long request, 178long subarch_ptrace(struct task_struct *child, long request,
179 unsigned long addr, unsigned long data) 179 unsigned long addr, unsigned long data)
180{ 180{
181 int ret = -EIO; 181 return -EIO;
182 void __user *datap = (void __user *) data;
183
184 switch (request) {
185 case PTRACE_GETFPXREGS: /* Get the child FPU state. */
186 ret = get_fpregs(datap, child);
187 break;
188 case PTRACE_SETFPXREGS: /* Set the child FPU state. */
189 ret = set_fpregs(datap, child);
190 break;
191 }
192
193 return ret;
194} 182}