Skip to content

L
linux
Commit 1fe53e2a authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

ppc64: signal fix from 2.4 branch

parent 50aaccb1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
arch/ppc64/kernel/signal32.c
View file @ 1fe53e2a
...@@ -1245,18 +1245,19 @@ handle_signal32(unsigned long sig, struct k_sigaction *ka, ...@@ -1245,18 +1245,19 @@ handle_signal32(unsigned long sig, struct k_sigaction *ka,
|| __put_user((unsigned int)frame, &sc->regs) || __put_user((unsigned int)frame, &sc->regs)
|| __put_user(sig, &sc->signal)) || __put_user(sig, &sc->signal))
goto badframe; goto badframe;
}
if (ka->sa.sa_flags & SA_ONESHOT) if (ka->sa.sa_flags & SA_ONESHOT)
ka->sa.sa_handler = SIG_DFL; ka->sa.sa_handler = SIG_DFL;
if (!(ka->sa.sa_flags & SA_NODEFER)) { if (!(ka->sa.sa_flags & SA_NODEFER)) {
spin_lock_irq(&current->sigmask_lock); spin_lock_irq(&current->sigmask_lock);
sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask); sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
sigaddset(&current->blocked,sig); sigaddset(&current->blocked,sig);
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sigmask_lock); spin_unlock_irq(&current->sigmask_lock);
}
} }
return; return;
badframe: badframe:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7