2 files changed, 34 insertions, 3 deletions
diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c
index b06c780e8dba..a32ba6ab1211 100644
--- a/arch/um/os-Linux/registers.c
+++ b/arch/um/os-Linux/registers.c
@@ -47,6 +47,8 @@ void init_registers(int pid)
 	if (err)
 		panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
 		      errno);
+
+	arch_init_registers(pid);
 }
 
 void get_safe_registers(unsigned long *regs)
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index f171204caa4e..8f1f0ab639b9 100644
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -8,9 +8,6 @@
 #include "longjmp.h"
 #include "user.h"
 
-/* XXX These need to use [GS]ETFPXREGS and copy_sc_{to,from}_user_skas needs
- * to pass in a sufficiently large buffer
- */
 int save_fp_registers(int pid, unsigned long *fp_regs)
 {
 	if(ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)
@@ -25,6 +22,20 @@ int restore_fp_registers(int pid, unsigned long *fp_regs)
 	return 0;
 }
 
+int save_fpx_registers(int pid, unsigned long *fp_regs)
+{
+	if(ptrace(PTRACE_GETFPXREGS, pid, 0, fp_regs) < 0)
+		return -errno;
+	return 0;
+}
+
+int restore_fpx_registers(int pid, unsigned long *fp_regs)
+{
+	if(ptrace(PTRACE_SETFPXREGS, pid, 0, fp_regs) < 0)
+		return -errno;
+	return 0;
+}
+
 unsigned long get_thread_reg(int reg, jmp_buf *buf)
 {
 	switch(reg){
@@ -36,3 +47,21 @@ unsigned long get_thread_reg(int reg, jmp_buf *buf)
 		return 0;
 	}
 }
+
+int have_fpx_regs = 1;
+
+void arch_init_registers(int pid)
+{
+	unsigned long fpx_regs[HOST_XFP_SIZE];
+	int err;
+
+	err = ptrace(PTRACE_GETFPXREGS, pid, 0, fpx_regs);
+	if(!err)
+		return;
+
+	if(errno != EIO)
+		panic("check_ptrace : PTRACE_GETFPXREGS failed, errno = %d",
+		      errno);
+
+	have_fpx_regs = 0;
+}