git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
um
/
sys-i386
/
signal.c
diff --git
a/arch/um/sys-i386/signal.c
b/arch/um/sys-i386/signal.c
index
03913ca
..
7cd1a82
100644
(file)
--- a/
arch/um/sys-i386/signal.c
+++ b/
arch/um/sys-i386/signal.c
@@
-10,7
+10,6
@@
#include "asm/uaccess.h"
#include "asm/unistd.h"
#include "frame_kern.h"
#include "asm/uaccess.h"
#include "asm/unistd.h"
#include "frame_kern.h"
-#include "signal_user.h"
#include "sigcontext.h"
#include "registers.h"
#include "mode.h"
#include "sigcontext.h"
#include "registers.h"
#include "mode.h"
@@
-122,9
+121,9
@@
int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext *from,
int err;
to_fp = to->fpstate;
int err;
to_fp = to->fpstate;
- from_fp = from->fpstate;
sigs = to->oldmask;
err = copy_from_user(to, from, sizeof(*to));
sigs = to->oldmask;
err = copy_from_user(to, from, sizeof(*to));
+ from_fp = to->fpstate;
to->oldmask = sigs;
to->fpstate = to_fp;
if(to_fp != NULL)
to->oldmask = sigs;
to->fpstate = to_fp;
if(to_fp != NULL)
@@
-312,7
+311,7
@@
long sys_sigreturn(struct pt_regs regs)
unsigned long __user *extramask = frame->extramask;
int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
unsigned long __user *extramask = frame->extramask;
int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
- if(copy_from_user(&set.sig[0], oldmask, sizeof(
&
set.sig[0])) ||
+ if(copy_from_user(&set.sig[0], oldmask, sizeof(set.sig[0])) ||
copy_from_user(&set.sig[1], extramask, sig_size))
goto segfault;
copy_from_user(&set.sig[1], extramask, sig_size))
goto segfault;