vserver 1.9.5.x5

[linux-2.6.git] / arch / um / sys-i386 / sigcontext.c

diff --git a/arch/um/sys-i386/sigcontext.c b/arch/um/sys-i386/sigcontext.c
index 28b16cd..467d489 100644 (file)
--- a/arch/um/sys-i386/sigcontext.c
+++ b/arch/um/sys-i386/sigcontext.c
@@ -9,29 +9,20 @@
 #include <asm/sigcontext.h>
 #include "sysdep/ptrace.h"
 #include "kern_util.h"
-#include "frame_user.h"
-
-int sc_size(void *data)
-{
-       struct arch_frame_data *arch = data;
-
-       return(sizeof(struct sigcontext) + arch->fpstate_size);
-}
 
 void sc_to_sc(void *to_ptr, void *from_ptr)
 {
        struct sigcontext *to = to_ptr, *from = from_ptr;
-       int size = sizeof(*to) + signal_frame_sc.common.arch.fpstate_size;
 
-       memcpy(to, from, size);
-       if(from->fpstate != NULL) to->fpstate = (struct _fpstate *) (to + 1);
+       memcpy(to, from, sizeof(*to) + sizeof(struct _fpstate));
+       if(from->fpstate != NULL)
+               to->fpstate = (struct _fpstate *) (to + 1);
 }
 
 unsigned long *sc_sigmask(void *sc_ptr)
 {
        struct sigcontext *sc = sc_ptr;
-
-       return(&sc->oldmask);
+       return &sc->oldmask;
 }
 
 int sc_get_fpregs(unsigned long buf, void *sc_ptr)