projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
um
/
kernel
/
signal.c
diff --git
a/arch/um/kernel/signal.c
b/arch/um/kernel/signal.c
index 4aa9808ba2642c99b4a19fbebc445ca17956a853..c4020c3d7857e7bae4fa053c61e1565f07a7185e 100644
(file)
--- a/
arch/um/kernel/signal.c
+++ b/
arch/um/kernel/signal.c
@@
-3,7
+3,6
@@
* Licensed under the GPL
*/
* Licensed under the GPL
*/
-#include "linux/config.h"
#include "linux/stddef.h"
#include "linux/sys.h"
#include "linux/sched.h"
#include "linux/stddef.h"
#include "linux/sys.h"
#include "linux/sched.h"
@@
-18,7
+17,6
@@
#include "asm/signal.h"
#include "asm/uaccess.h"
#include "asm/unistd.h"
#include "asm/signal.h"
#include "asm/uaccess.h"
#include "asm/unistd.h"
-#include "user_util.h"
#include "asm/ucontext.h"
#include "kern_util.h"
#include "signal_kern.h"
#include "asm/ucontext.h"
#include "kern_util.h"
#include "signal_kern.h"
@@
-159,12
+157,12
@@
static int kern_do_signal(struct pt_regs *regs)
clear_thread_flag(TIF_RESTORE_SIGMASK);
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
}
clear_thread_flag(TIF_RESTORE_SIGMASK);
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
}
- return
(handled_sig)
;
+ return
handled_sig
;
}
int do_signal(void)
{
}
int do_signal(void)
{
- return
(kern_do_signal(¤t->thread.regs)
);
+ return
kern_do_signal(¤t->thread.regs
);
}
/*
}
/*
@@
-187,5
+185,5
@@
long sys_sigsuspend(int history0, int history1, old_sigset_t mask)
long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
{
long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
{
- return
(do_sigaltstack(uss, uoss, PT_REGS_SP(¤t->thread.regs)
));
+ return
do_sigaltstack(uss, uoss, PT_REGS_SP(¤t->thread.regs
));
}
}