2 files changed, 10 insertions, 12 deletions
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c
index 85e0032e664f..693771961f85 100644
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
@@ -517,13 +517,12 @@ handle_signal(int canrestart, unsigned long sig,
        if (ka->sa.sa_flags & SA_ONESHOT)
                ka->sa.sa_handler = SIG_DFL;
-        if (!(ka->sa.sa_flags & SA_NODEFER)) {
+        spin_lock_irq(&current->sighand->siglock);
-                spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        if (!(ka->sa.sa_flags & SA_NODEFER))
                sigaddset(&current->blocked,sig);
-                recalc_sigpending();
+        recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
+        spin_unlock_irq(&current->sighand->siglock);
-        }
 }
 /*
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index fb4c79d5b76b..0a3614dab887 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -568,13 +568,12 @@ handle_signal(int canrestart, unsigned long sig,
        if (ka->sa.sa_flags & SA_ONESHOT)
                ka->sa.sa_handler = SIG_DFL;
-        if (!(ka->sa.sa_flags & SA_NODEFER)) {
+        spin_lock_irq(&current->sighand->siglock);
-                spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        if (!(ka->sa.sa_flags & SA_NODEFER))
                sigaddset(&current->blocked,sig);
-                recalc_sigpending();
+        recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
+        spin_unlock_irq(&current->sighand->siglock);
-        }
 }
 /*

diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index 85e0032e664f..693771961f85 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c
@@ -517,13 +517,12 @@ handle_signal(int canrestart, unsigned long sig,
517	if (ka->sa.sa_flags & SA_ONESHOT)	517	if (ka->sa.sa_flags & SA_ONESHOT)
518	ka->sa.sa_handler = SIG_DFL;	518	ka->sa.sa_handler = SIG_DFL;
519		519
520	if (!(ka->sa.sa_flags & SA_NODEFER)) {	520	spin_lock_irq(&current->sighand->siglock);
521	spin_lock_irq(&current->sighand->siglock);	521	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
522	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	522	if (!(ka->sa.sa_flags & SA_NODEFER))
523	sigaddset(&current->blocked,sig);	523	sigaddset(&current->blocked,sig);
524	recalc_sigpending();	524	recalc_sigpending();
525	spin_unlock_irq(&current->sighand->siglock);	525	spin_unlock_irq(&current->sighand->siglock);
526	}
527	}	526	}
528		527
529	/*	528	/*


diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index fb4c79d5b76b..0a3614dab887 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c
@@ -568,13 +568,12 @@ handle_signal(int canrestart, unsigned long sig,
568	if (ka->sa.sa_flags & SA_ONESHOT)	568	if (ka->sa.sa_flags & SA_ONESHOT)
569	ka->sa.sa_handler = SIG_DFL;	569	ka->sa.sa_handler = SIG_DFL;
570		570
571	if (!(ka->sa.sa_flags & SA_NODEFER)) {	571	spin_lock_irq(&current->sighand->siglock);
572	spin_lock_irq(&current->sighand->siglock);	572	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
573	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	573	if (!(ka->sa.sa_flags & SA_NODEFER))
574	sigaddset(&current->blocked,sig);	574	sigaddset(&current->blocked,sig);
575	recalc_sigpending();	575	recalc_sigpending();
576	spin_unlock_irq(&current->sighand->siglock);	576	spin_unlock_irq(&current->sighand->siglock);
577	}
578	}	577	}
579		578
580	/*	579	/*