Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

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

diff --git a/arch/um/os-Linux/sys-x86_64/registers.c b/arch/um/os-Linux/sys-x86_64/registers.c
index 001941f..cb8e8a2 100644 (file)
--- a/arch/um/os-Linux/sys-x86_64/registers.c
+++ b/arch/um/os-Linux/sys-x86_64/registers.c
@@ -5,11 +5,11 @@
 
 #include <errno.h>
 #include <string.h>
-#include <setjmp.h>
 #include "ptrace_user.h"
 #include "uml-config.h"
 #include "skas_ptregs.h"
 #include "registers.h"
+#include "longjmp.h"
 #include "user.h"
 
 /* These are set once at boot time and not changed thereafter */
@@ -62,12 +62,12 @@ void init_registers(int pid)
        err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
        if(err)
                panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
-                     err);
+                     errno);
 
        err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
        if(err)
                panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
-                     err);
+                     errno);
 }
 
 void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
@@ -78,11 +78,14 @@ void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)
                       HOST_FP_SIZE * sizeof(unsigned long));
 }
 
-void get_thread_regs(union uml_pt_regs *uml_regs, void *buffer)
+unsigned long get_thread_reg(int reg, jmp_buf *buf)
 {
-       struct __jmp_buf_tag *jmpbuf = buffer;
-
-       UPT_SET(uml_regs, RIP, jmpbuf->__jmpbuf[JB_PC]);
-       UPT_SET(uml_regs, RSP, jmpbuf->__jmpbuf[JB_RSP]);
-       UPT_SET(uml_regs, RBP, jmpbuf->__jmpbuf[JB_RBP]);
+       switch(reg){
+       case RIP: return buf[0]->__rip;
+       case RSP: return buf[0]->__rsp;
+       case RBP: return buf[0]->__rbp;
+       default:
+               printk("get_thread_regs - unknown register %d\n", reg);
+               return 0;
+       }
 }