Commit 4a22709e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arch-cleanup-2020-10-22' of git://git.kernel.dk/linux-block 

Pull arch task_work cleanups from Jens Axboe:
 "Two cleanups that don't fit other categories:

   - Finally get the task_work_add() cleanup done properly, so we don't
     have random 0/1/false/true/TWA_SIGNAL confusing use cases. Updates
     all callers, and also fixes up the documentation for
     task_work_add().

   - While working on some TIF related changes for 5.11, this
     TIF_NOTIFY_RESUME cleanup fell out of that. Remove some arch
     duplication for how that is handled"

* tag 'arch-cleanup-2020-10-22' of git://git.kernel.dk/linux-block:
  task_work: cleanup notification modes
  tracehook: clear TIF_NOTIFY_RESUME in tracehook_notify_resume()
parents 0a14d764 91989c70

arch/alpha/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ do_work_pending(struct pt_regs *regs, unsigned long thread_flags, 
				do_signal(regs, r0, r19);

				r0 = 0;

			} else {

				clear_thread_flag(TIF_NOTIFY_RESUME);

				tracehook_notify_resume(regs);

			}

		}

arch/arc/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -394,6 +394,6 @@ void do_notify_resume(struct pt_regs *regs) 
	 * ASM glue gaurantees that this is only called when returning to

	 * user mode

	 */

	if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))

	if (test_thread_flag(TIF_NOTIFY_RESUME))

		tracehook_notify_resume(regs);

}

arch/arm/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) 
			} else if (thread_flags & _TIF_UPROBE) {

				uprobe_notify_resume(regs);

			} else {

				clear_thread_flag(TIF_NOTIFY_RESUME);

				tracehook_notify_resume(regs);

				rseq_handle_notify_resume(NULL, regs);

			}

arch/arm64/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, 
				do_signal(regs);



			if (thread_flags & _TIF_NOTIFY_RESUME) {

				clear_thread_flag(TIF_NOTIFY_RESUME);

				tracehook_notify_resume(regs);

				rseq_handle_notify_resume(NULL, regs);

			}

arch/c6x/kernel/signal.c

+1 −3
Original line number Diff line number Diff line
@@ -316,8 +316,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags, 
	if (thread_info_flags & (1 << TIF_SIGPENDING))

		do_signal(regs, syscall);



	if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

	if (thread_info_flags & (1 << TIF_NOTIFY_RESUME))

		tracehook_notify_resume(regs);

}
 
}

CRA Git | Maintained and supported by SUSTech CRA and CCSE