uml: ptrace floating point fixes

Handle floating point state better in ptrace.  The code now correctly
distinguishes between PTRACE_[GS]ETFPREGS and PTRACE_[GS]ETFPXREGS.  The FPX
requests get handed off to arch-specific code because that's not generic.

get_fpregs, set_fpregs, set_fpregs, and set_fpxregs needed real
implementations.

Something here exposed a missing include in asm/page.h, which needed
linux/types.h in order to get gfp_t, so that's fixed here.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 12 deletions

diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index db55a017e9b9..2511f9199417 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -143,22 +143,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 #endif
 #ifdef PTRACE_GETFPREGS
         case PTRACE_GETFPREGS: /* Get the child FPU state. */
-                ret = get_fpregs(data, child);
+                ret = get_fpregs((struct user_i387_struct __user *) data,
+                                 child);
                 break;
 #endif
 #ifdef PTRACE_SETFPREGS
         case PTRACE_SETFPREGS: /* Set the child FPU state. */
-                ret = set_fpregs(data, child);
-                break;
-#endif
-#ifdef PTRACE_GETFPXREGS
-        case PTRACE_GETFPXREGS: /* Get the child FPU state. */
-                ret = get_fpxregs(data, child);
-                break;
-#endif
-#ifdef PTRACE_SETFPXREGS
-        case PTRACE_SETFPXREGS: /* Set the child FPU state. */
-                ret = set_fpxregs(data, child);
+                ret = set_fpregs((struct user_i387_struct __user *) data,
+                                 child);
                 break;
 #endif
         case PTRACE_GET_THREAD_AREA:
@@ -227,6 +219,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 #endif
         default:
                 ret = ptrace_request(child, request, addr, data);
+                if (ret == -EIO)
+                        ret = subarch_ptrace(child, request, addr, data);
                 break;
         }