2 files changed, 4 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index f674006dea2f..b6c0029389fe 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -216,6 +216,7 @@ config PPC
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_VIRT_CPU_ACCOUNTING
         select HAVE_IRQ_TIME_ACCOUNTING
+        select HAVE_RSEQ
         select IOMMU_HELPER                     if PPC64
         select IRQ_DOMAIN
         select IRQ_FORCED_THREADING
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 61db86ecd318..d3bb3aaaf5ac 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -133,6 +133,8 @@ static void do_signal(struct task_struct *tsk)
         /* Re-enable the breakpoints for the signal stack */
         thread_change_pc(tsk, tsk->thread.regs);
 
+        rseq_signal_deliver(tsk->thread.regs);
+
         if (is32) {
                 if (ksig.ka.sa.sa_flags & SA_SIGINFO)
                         ret = handle_rt_signal32(&ksig, oldset, tsk);
@@ -164,6 +166,7 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(regs);
+                rseq_handle_notify_resume(regs);
         }
 
         user_enter();