---

yaml --- r: 295142 b: refs/heads/master c: f6adb9a h: refs/heads/master v: v3
git-mirror · Mar 23, 2012 · 22fec85 · 22fec85
1 parent d35fad0
commit 22fec85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6629326b89b6e69cc44276e1649a31158bb2c819
+refs/heads/master: f6adb9a6aec0ec9540e15f354e5cdec88b2aea33
diff --git a/trunk/arch/um/kernel/signal.c b/trunk/arch/um/kernel/signal.c
@@ -65,13 +65,9 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
 #endif
 		err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
 
-	if (err) {
-		spin_lock_irq(&current->sighand->siglock);
-		current->blocked = *oldset;
-		recalc_sigpending();
-		spin_unlock_irq(&current->sighand->siglock);
+	if (err)
 		force_sigsegv(signr, current);
-	} else {
+	else {
 		spin_lock_irq(&current->sighand->siglock);
 		sigorsets(&current->blocked, &current->blocked,
 			  &ka->sa.sa_mask);