Commit fc9fb19f authored by Jens Axboe's avatar Jens Axboe Committed by sanglipeng
Browse files

m68k: add support for TIF_NOTIFY_SIGNAL 

stable inclusion
from stable-v5.10.162
commit fe137f46d41f90e1a36134e7876db897a25b7926
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7P7OH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fe137f46d41f90e1a36134e7876db897a25b7926



--------------------------------

[ Upstream commit e660653c ]

Wire up TIF_NOTIFY_SIGNAL handling for m68k.

Cc: linux-m68k@lists.linux-m68k.org
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent a27a7a6c

arch/m68k/include/asm/thread_info.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static inline struct thread_info *current_thread_info(void) 
 * bits 0-7 are tested at every exception exit

 * bits 8-15 are also tested at syscall exit

 */

#define TIF_NOTIFY_SIGNAL	4

#define TIF_NOTIFY_RESUME	5	/* callback before returning to user */

#define TIF_SIGPENDING		6	/* signal pending */

#define TIF_NEED_RESCHED	7	/* rescheduling necessary */

arch/m68k/kernel/signal.c

+2 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,8 @@ static void do_signal(struct pt_regs *regs) 


void do_notify_resume(struct pt_regs *regs)

{

	if (test_thread_flag(TIF_SIGPENDING))

	if (test_thread_flag(TIF_NOTIFY_SIGNAL) ||

	    test_thread_flag(TIF_SIGPENDING))

		do_signal(regs);



	if (test_thread_flag(TIF_NOTIFY_RESUME))