Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / arch / um / os-Linux / registers.c

diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c
index 9dc3fad9ea29e45f56412382bcd9f90e00d0d248..a32ba6ab12112e3c6379d55588e538560512fb28 100644 (file)
--- a/arch/um/os-Linux/registers.c
+++ b/arch/um/os-Linux/registers.c
@@ -1,39 +1,40 @@
 /*
  * Copyright (C) 2004 PathScale, Inc
+ * Copyright (C) 2004 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
 #include <errno.h>
 #include <string.h>
 #include <sys/ptrace.h>
-#include "user.h"
 #include "sysdep/ptrace.h"
+#include "user.h"
 
 /* This is set once at boot time and not changed thereafter */
 
 static unsigned long exec_regs[MAX_REG_NR];
 
-void init_thread_registers(union uml_pt_regs *to)
+void init_thread_registers(struct uml_pt_regs *to)
 {
-       memcpy(to->skas.regs, exec_regs, sizeof(to->skas.regs));
+       memcpy(to->gp, exec_regs, sizeof(to->gp));
 }
 
-void save_registers(int pid, union uml_pt_regs *regs)
+void save_registers(int pid, struct uml_pt_regs *regs)
 {
        int err;
 
-       err = ptrace(PTRACE_GETREGS, pid, 0, regs->skas.regs);
-       if(err < 0)
+       err = ptrace(PTRACE_GETREGS, pid, 0, regs->gp);
+       if (err < 0)
                panic("save_registers - saving registers failed, errno = %d\n",
                      errno);
 }
 
-void restore_registers(int pid, union uml_pt_regs *regs)
+void restore_registers(int pid, struct uml_pt_regs *regs)
 {
        int err;
 
-       err = ptrace(PTRACE_SETREGS, pid, 0, regs->skas.regs);
-       if(err < 0)
+       err = ptrace(PTRACE_SETREGS, pid, 0, regs->gp);
+       if (err < 0)
                panic("restore_registers - saving registers failed, "
                      "errno = %d\n", errno);
 }
@@ -43,9 +44,11 @@ void init_registers(int pid)
        int err;
 
        err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
-       if(err)
+       if (err)
                panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
                      errno);
+
+       arch_init_registers(pid);
 }
 
 void get_safe_registers(unsigned long *regs)