Merge branch 'core/urgent' into core/entry

Pick up the entry fix before further modifications.

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc include/linux/entry-common.h
index c7bfac4,474f296..b9711e8
--- 1/include/linux/entry-common.h
--- 2/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@@ -37,12 -37,8 +37,12 @@@
  # define _TIF_UPROBE                  (0)
  #endif
  
 +#ifndef _TIF_NOTIFY_SIGNAL
 +# define _TIF_NOTIFY_SIGNAL           (0)
 +#endif
 +
  /*
-  * TIF flags handled in syscall_enter_from_usermode()
+  * TIF flags handled in syscall_enter_from_user_mode()
   */
  #ifndef ARCH_SYSCALL_ENTER_WORK
  # define ARCH_SYSCALL_ENTER_WORK      (0)

diff --cc include/linux/tracehook.h
Simple merge

diff --cc kernel/entry/common.c
index f7ed415,e9e2df3..3a1dfec
--- 1/kernel/entry/common.c
--- 2/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@@ -139,11 -157,10 +165,10 @@@ static unsigned long exit_to_user_mode_
                if (ti_work & _TIF_PATCH_PENDING)
                        klp_update_patch_state(current);
  
 -              if (ti_work & _TIF_SIGPENDING)
 -                      arch_do_signal(regs);
 +              if (ti_work & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))
 +                      handle_signal_work(regs, ti_work);
  
                if (ti_work & _TIF_NOTIFY_RESUME) {
-                       clear_thread_flag(TIF_NOTIFY_RESUME);
                        tracehook_notify_resume(regs);
                        rseq_handle_notify_resume(NULL, regs);
                }

diff --cc kernel/entry/kvm.c
Simple merge

diff --cc kernel/events/uprobes.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/task_work.c
index ae05889,8d6e121..15b0872
--- 1/kernel/task_work.c
--- 2/kernel/task_work.c
+++ b/kernel/task_work.c
@@@ -52,10 -29,11 +57,10 @@@ static void task_work_notify_signal(str
   * RETURNS:
   * 0 if succeeds or -ESRCH.
   */
- int
- task_work_add(struct task_struct *task, struct callback_head *work, int notify)
+ int task_work_add(struct task_struct *task, struct callback_head *work,
+                 enum task_work_notify_mode notify)
  {
        struct callback_head *head;
 -      unsigned long flags;
  
        do {
                head = READ_ONCE(task->task_works);
@@@ -69,8 -49,21 +76,11 @@@
                set_notify_resume(task);
                break;
        case TWA_SIGNAL:
 -              /*
 -               * Only grab the sighand lock if we don't already have some
 -               * task_work pending. This pairs with the smp_store_mb()
 -               * in get_signal(), see comment there.
 -               */
 -              if (!(READ_ONCE(task->jobctl) & JOBCTL_TASK_WORK) &&
 -                  lock_task_sighand(task, &flags)) {
 -                      task->jobctl |= JOBCTL_TASK_WORK;
 -                      signal_wake_up(task, 0);
 -                      unlock_task_sighand(task, &flags);
 -              }
 +              task_work_notify_signal(task);
                break;
+       default:
+               WARN_ON_ONCE(1);
+               break;
        }
  
        return 0;