Auto-update from upstream

author: Tony Luck <tony.luck@intel.com> 2005-08-30 12:30:09 -0400
committer: Tony Luck <tony.luck@intel.com> 2005-08-30 12:30:09 -0400
commit: 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch)
tree: eab3d229c7a527816db405299ce9603e538b521f /arch/mips
parent: e438befd76a5a743725a89365140a8a7bf276096 (diff)
parent: d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff)
3 files changed, 15 insertions, 18 deletions
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 40244782a8e5..4c114ae21793 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -155,13 +155,12 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
        else
                setup_irix_frame(ka, regs, sig, oldset);
-        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);
-        }
 }
 asmlinkage int do_irix_signal(sigset_t *oldset, struct pt_regs *regs)
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 65ee15396ffd..0209c1dd1429 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -425,13 +425,12 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
                setup_frame(ka, regs, sig, oldset);
 #endif
-        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);
-        }
 }
 extern int do_signal32(sigset_t *oldset, struct pt_regs *regs);
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index c1a69cf232f9..f6875f023a29 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -751,13 +751,12 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
        else
                setup_frame(ka, regs, sig, oldset);
-        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);
-        }
 }
 int do_signal32(sigset_t *oldset, struct pt_regs *regs)
author	Tony Luck <tony.luck@intel.com>	2005-08-30 12:30:09 -0400
committer	Tony Luck <tony.luck@intel.com>	2005-08-30 12:30:09 -0400
commit	288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch)
tree	eab3d229c7a527816db405299ce9603e538b521f /arch/mips
parent	e438befd76a5a743725a89365140a8a7bf276096 (diff)
parent	d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff)

diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 40244782a8e5..4c114ae21793 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c
@@ -155,13 +155,12 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
155	else	155	else
156	setup_irix_frame(ka, regs, sig, oldset);	156	setup_irix_frame(ka, regs, sig, oldset);
157		157
158	if (!(ka->sa.sa_flags & SA_NODEFER)) {	158	spin_lock_irq(&current->sighand->siglock);
159	spin_lock_irq(&current->sighand->siglock);	159	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
160	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	160	if (!(ka->sa.sa_flags & SA_NODEFER))
161	sigaddset(&current->blocked,sig);	161	sigaddset(&current->blocked,sig);
162	recalc_sigpending();	162	recalc_sigpending();
163	spin_unlock_irq(&current->sighand->siglock);	163	spin_unlock_irq(&current->sighand->siglock);
164	}
165	}	164	}
166		165
167	asmlinkage int do_irix_signal(sigset_t oldset, struct pt_regs regs)	166	asmlinkage int do_irix_signal(sigset_t oldset, struct pt_regs regs)


diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 65ee15396ffd..0209c1dd1429 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c
@@ -425,13 +425,12 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
425	setup_frame(ka, regs, sig, oldset);	425	setup_frame(ka, regs, sig, oldset);
426	#endif	426	#endif
427		427
428	if (!(ka->sa.sa_flags & SA_NODEFER)) {	428	spin_lock_irq(&current->sighand->siglock);
429	spin_lock_irq(&current->sighand->siglock);	429	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
430	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	430	if (!(ka->sa.sa_flags & SA_NODEFER))
431	sigaddset(&current->blocked,sig);	431	sigaddset(&current->blocked,sig);
432	recalc_sigpending();	432	recalc_sigpending();
433	spin_unlock_irq(&current->sighand->siglock);	433	spin_unlock_irq(&current->sighand->siglock);
434	}
435	}	434	}
436		435
437	extern int do_signal32(sigset_t oldset, struct pt_regs regs);	436	extern int do_signal32(sigset_t oldset, struct pt_regs regs);


diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index c1a69cf232f9..f6875f023a29 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c
@@ -751,13 +751,12 @@ static inline void handle_signal(unsigned long sig, siginfo_t *info,
751	else	751	else
752	setup_frame(ka, regs, sig, oldset);	752	setup_frame(ka, regs, sig, oldset);
753		753
754	if (!(ka->sa.sa_flags & SA_NODEFER)) {	754	spin_lock_irq(&current->sighand->siglock);
755	spin_lock_irq(&current->sighand->siglock);	755	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
756	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	756	if (!(ka->sa.sa_flags & SA_NODEFER))
757	sigaddset(&current->blocked,sig);	757	sigaddset(&current->blocked,sig);
758	recalc_sigpending();	758	recalc_sigpending();
759	spin_unlock_irq(&current->sighand->siglock);	759	spin_unlock_irq(&current->sighand->siglock);
760	}
761	}	760	}
762		761
763	int do_signal32(sigset_t oldset, struct pt_regs regs)	762	int do_signal32(sigset_t oldset, struct pt_regs regs)