Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / arch / alpha / kernel / signal.c

diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 3739efc..bc077ba 100644 (file)
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -219,7 +219,7 @@ do_sigreturn(struct sigcontext __user *sc)
 
        /* Send SIGTRAP if we're single-stepping: */
        if (ptrace_cancel_bpt (current)) {
-               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc, 0,
+               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc,
                               current);
        }
        return;
@@ -247,7 +247,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame)
 
        /* Send SIGTRAP if we're single-stepping: */
        if (ptrace_cancel_bpt (current)) {
-               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc, 0,
+               send_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *) regs->pc,
                               current);
        }
        return;
@@ -527,7 +527,7 @@ do_work_pending(struct pt_regs *regs, unsigned long thread_flags,
                        schedule();
                } else {
                        local_irq_enable();
-                       if (thread_flags & _TIF_SIGPENDING) {
+                       if (thread_flags & (_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL)) {
                                do_signal(regs, r0, r19);
                                r0 = 0;
                        } else {