avr32: get rid of useless args in signal.c before other work there
PATCH 2/6 avr32: get rid of useless args in signal.c before other work there
--- arch/avr32/kernel/signal.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
arch/avr32/kernel/signal.c +7 -7
@@ -224,7 +224,7 @@ static inline void setup_syscall_restart(struct pt_regs *regs)static inline void handle_signal (unsigned long sig,struct k_sigaction *ka,siginfo_t *info, -sigset_t *oldset,struct pt_regs *regs,int syscall) +sigset_t *oldset,struct pt_regs *regs) {int ret;
@@ -261,11 +261,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,* doesn't want to handle. Thus you cannot kill init even with a * SIGKILL even by mistake. */ -int do_signal (struct pt_regs *regs,sigset_t *oldset,int syscall) +static void do_signal (struct pt_regs *regs,int syscall) {siginfo_t info;int signr;struct k_sigaction ka; +sigset_t *oldset;/* * We want the common case to go fast, which is why we may in
@@ -273,7 +274,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)* without doing anything if so. */ if (!user_mode (regs)) -return 0 ; +return ;if (test_thread_flag (TIF_RESTORE_SIGMASK )) oldset = ¤t->saved_sigmask;
@@ -307,11 +308,10 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)clear_thread_flag (TIF_RESTORE_SIGMASK );sigprocmask (SIG_SETMASK , ¤t->saved_sigmask,NULL ); } -return 0 ; +return ; } -handle_signal (signr, &ka, &info, oldset, regs, syscall); -return 1 ; +handle_signal (signr, &ka, &info, oldset, regs); } asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
@@ -322,7 +322,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) syscall =1 ;if (ti->flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) -do_signal (regs, ¤t->blocked, syscall); +do_signal (regs, syscall);if (ti->flags & _TIF_NOTIFY_RESUME) {clear_thread_flag (TIF_NOTIFY_RESUME );
Signature · 1 line
1.5.6.5
Quoted 1 line · Al Viro
Signed-off-by Al Viro <[email protected]>
<snipp>
arch/avr32/kernel/signal.c handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, · line 269
Quoted 11 lines
arch/avr32/kernel/signal.c +2
-1@@ -261,11 +261,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,* doesn't want to handle. Thus you cannot kill init even with a * SIGKILL even by mistake. */ -int do_signal (struct pt_regs *regs,sigset_t *oldset,int syscall) +static void do_signal (struct pt_regs *regs,int syscall) {siginfo_t info;int signr;struct k_sigaction ka; +sigset_t *oldset;
Should be initialized as it is checked in the else if block further below.
<snipp>
Signature · 1 line
Hans-Christian Egtvedt
Quoted 5 lines · Hans-Christian Egtvedt
Quoted 1 line · Al Viro
Signed-off-by Al Viro <[email protected]><snipp>
Quoted 14 lines
arch/avr32/kernel/signal.c handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, · line 269
Quoted 11 lines
arch/avr32/kernel/signal.c +2
-1@@ -261,11 +261,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,* doesn't want to handle. Thus you cannot kill init even with a * SIGKILL even by mistake. */ -int do_signal (struct pt_regs *regs,sigset_t *oldset,int syscall) +static void do_signal (struct pt_regs *regs,int syscall) {siginfo_t info;int signr;struct k_sigaction ka; +sigset_t *oldset;Should be initialized as it is checked in the else if block further below.
That else if should be simply else...
Quoted 18 lines · Al Viro
Quoted 16 lines · Hans-Christian Egtvedt
arch/avr32/kernel/signal.c handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, · line 269
Quoted 12 lines · Al Viro
Signed-off-by Al Viro <[email protected]>arch/avr32/kernel/signal.c +2
-1@@ -261,11 +261,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,* doesn't want to handle. Thus you cannot kill init even with a * SIGKILL even by mistake. */ -int do_signal (struct pt_regs *regs,sigset_t *oldset,int syscall) +static void do_signal (struct pt_regs *regs,int syscall) {siginfo_t info;int signr;struct k_sigaction ka; +sigset_t *oldset;Should be initialized as it is checked in the else if block further below.
Quoted 1 line
That else if should be simply else...
Ah, that made a lot more sense. I'm still on my first cup of coffee brushing dust of your series.
Signature · 1 line
Hans-Christian Egtvedt