aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2007-11-28 08:51:44 -0500
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2008-01-25 02:31:39 -0500
commit7f0f616bb093823b70855685cf085d39a8784818 (patch)
tree64dd565a8dd74c319947825ec8dbc7f8b873c46b /arch
parent3611553ef985ef7c5863c8a94641738addd04cff (diff)
[AVR32] Remove redundant try_to_freeze() call from do_signal()
get_signal_to_deliver() will call try_to_freeze(), so there's no point in do_signal() doing it as well. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/kernel/signal.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index 0ec14854a200..5616a00c10ba 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -270,19 +270,12 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)
270 if (!user_mode(regs)) 270 if (!user_mode(regs))
271 return 0; 271 return 0;
272 272
273 if (try_to_freeze()) {
274 signr = 0;
275 if (!signal_pending(current))
276 goto no_signal;
277 }
278
279 if (test_thread_flag(TIF_RESTORE_SIGMASK)) 273 if (test_thread_flag(TIF_RESTORE_SIGMASK))
280 oldset = &current->saved_sigmask; 274 oldset = &current->saved_sigmask;
281 else if (!oldset) 275 else if (!oldset)
282 oldset = &current->blocked; 276 oldset = &current->blocked;
283 277
284 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 278 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
285no_signal:
286 if (syscall) { 279 if (syscall) {
287 switch (regs->r12) { 280 switch (regs->r12) {
288 case -ERESTART_RESTARTBLOCK: 281 case -ERESTART_RESTARTBLOCK: