Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

[powerpc.git] / arch / um / os-Linux / sys-i386 / registers.c

diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c
index 516f66d..7cd0369 100644 (file)
--- a/arch/um/os-Linux/sys-i386/registers.c
+++ b/arch/um/os-Linux/sys-i386/registers.c
@@ -5,12 +5,12 @@
 
 #include <errno.h>
 #include <string.h>
-#include <setjmp.h>
 #include "sysdep/ptrace_user.h"
 #include "sysdep/ptrace.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 */
@@ -130,11 +130,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, EIP, jmpbuf->__jmpbuf[JB_PC]);
-       UPT_SET(uml_regs, UESP, jmpbuf->__jmpbuf[JB_SP]);
-       UPT_SET(uml_regs, EBP, jmpbuf->__jmpbuf[JB_BP]);
+       switch(reg){
+       case EIP: return buf[0]->__eip;
+       case UESP: return buf[0]->__esp;
+       case EBP: return buf[0]->__ebp;
+       default:
+               printk("get_thread_regs - unknown register %d\n", reg);
+               return 0;
+       }
 }