Merge branch 'fix/hda' of git://github.com/tiwai/sound

[pandora-kernel.git] / arch / um / os-Linux / registers.c

diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c
index 14732f9..b866b9e 100644 (file)
--- a/arch/um/os-Linux/registers.c
+++ b/arch/um/os-Linux/registers.c
@@ -8,48 +8,51 @@
 #include <string.h>
 #include <sys/ptrace.h>
 #include "sysdep/ptrace.h"
-#include "user.h"
+#include "sysdep/ptrace_user.h"
+#include "registers.h"
 
-/* This is set once at boot time and not changed thereafter */
-
-static unsigned long exec_regs[MAX_REG_NR];
-
-void init_thread_registers(struct uml_pt_regs *to)
-{
-       memcpy(to->regs, exec_regs, sizeof(to->regs));
-}
-
-void save_registers(int pid, struct uml_pt_regs *regs)
+int save_registers(int pid, struct uml_pt_regs *regs)
 {
        int err;
 
-       err = ptrace(PTRACE_GETREGS, pid, 0, regs->regs);
+       err = ptrace(PTRACE_GETREGS, pid, 0, regs->gp);
        if (err < 0)
-               panic("save_registers - saving registers failed, errno = %d\n",
-                     errno);
+               return -errno;
+       return 0;
 }
 
-void restore_registers(int pid, struct uml_pt_regs *regs)
+int restore_registers(int pid, struct uml_pt_regs *regs)
 {
        int err;
 
-       err = ptrace(PTRACE_SETREGS, pid, 0, regs->regs);
+       err = ptrace(PTRACE_SETREGS, pid, 0, regs->gp);
        if (err < 0)
-               panic("restore_registers - saving registers failed, "
-                     "errno = %d\n", errno);
+               return -errno;
+       return 0;
 }
 
-void init_registers(int pid)
+/* This is set once at boot time and not changed thereafter */
+
+static unsigned long exec_regs[MAX_REG_NR];
+static unsigned long exec_fp_regs[FP_SIZE];
+
+int init_registers(int pid)
 {
        int err;
 
        err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
-       if (err)
-               panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
-                     errno);
+       if (err < 0)
+               return -errno;
+
+       arch_init_registers(pid);
+       get_fp_registers(pid, exec_fp_regs);
+       return 0;
 }
 
-void get_safe_registers(unsigned long *regs)
+void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
 {
        memcpy(regs, exec_regs, sizeof(exec_regs));
+
+       if (fp_regs)
+               memcpy(fp_regs, exec_fp_regs, sizeof(exec_fp_regs));
 }