1 files changed, 4 insertions, 3 deletions

diff --git a/kernel/signal.c b/kernel/signal.c
index d622eac9d169..35e97f4073c2 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -45,6 +45,7 @@
 #include <linux/posix-timers.h>
 #include <linux/livepatch.h>
 #include <linux/cgroup.h>
+#include <linux/audit.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/signal.h>
@@ -54,7 +55,6 @@
 #include <asm/unistd.h>
 #include <asm/siginfo.h>
 #include <asm/cacheflush.h>
-#include "audit.h"      /* audit_signal_info() */
 
 /*
  * SLAB caches for signal bits.
@@ -2912,7 +2912,8 @@ EXPORT_SYMBOL(set_compat_user_sigmask);
  * This is useful for syscalls such as ppoll, pselect, io_pgetevents and
  * epoll_pwait where a new sigmask is passed in from userland for the syscalls.
  */
-void restore_user_sigmask(const void __user *usigmask, sigset_t *sigsaved)
+void restore_user_sigmask(const void __user *usigmask, sigset_t *sigsaved,
+                                bool interrupted)
 {
 
         if (!usigmask)
@@ -2922,7 +2923,7 @@ void restore_user_sigmask(const void __user *usigmask, sigset_t *sigsaved)
          * Restoring sigmask here can lead to delivering signals that the above
          * syscalls are intended to block because of the sigmask passed in.
          */
-        if (signal_pending(current)) {
+        if (interrupted) {
                 current->saved_sigmask = *sigsaved;
                 set_restore_sigmask();
                 return;