diff --git a/[refs] b/[refs] index 56e181b7c249..f006547819af 100644 --- 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 index e8b889d3bce7..8382e0b91e8b 100644 --- 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(¤t->sighand->siglock); - current->blocked = *oldset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); + if (err) force_sigsegv(signr, current); - } else { + else { spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask);