Browse files

sh: Fix up TIF_NOTIFY_RESUME sans TIF_SIGPENDING handling.

As Al notes, we missed a TIF_NOTIFY_RESUME check which caused any
handlers without TIF_SIGPENDING also set to skip the notification:

	Looks like while it is in the relevant masks *and* checked in
	do_notify_resume() both on 32bit and 64bit variants since commit
	ab99c73 ("sh: Make syscall tracer
	use tracehook notifiers, add TIF_NOTIFY_RESUME.") they are
	actually *not* reached without simulataneous SIGPENDING, since
	the actual glue in the callers had not been updated back then and
	still checks for _TIF_SIGPENDING alone when deciding whether to
	hit do_notify_resume() or not.

Reported-by: Nobuhiro Iwamatsu <>
Signed-off-by: Al Viro <>
Tested-by: Nobuhiro Iwamatsu <>
Signed-off-by: Paul Mundt <>
  • Loading branch information...
1 parent 077664a commit 5e071e2b4b82599f07cce5e1d2d272feb462950c Al Viro committed with Paul Mundt Sep 18, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 arch/sh/kernel/cpu/sh5/entry.S
  2. +1 −1 arch/sh/kernel/entry-common.S
@@ -933,7 +933,7 @@ ret_with_reschedule:
pta restore_all, tr1
- movi _TIF_SIGPENDING, r8
and r8, r7, r8
pta work_notifysig, tr0
bne r8, ZERO, tr0
@@ -139,7 +139,7 @@ work_pending:
! r8: current_thread_info
! t: result of "tst #_TIF_NEED_RESCHED, r0"
bf/s work_resched
- tst #_TIF_SIGPENDING, r0
bt/s __restore_all
mov r15, r4

0 comments on commit 5e071e2

Please sign in to comment.