Commit fb21affa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 

Pull second pile of signal handling patches from Al Viro:
 "This one is just task_work_add() series + remaining prereqs for it.

  There probably will be another pull request from that tree this
  cycle - at least for helpers, to get them out of the way for per-arch
  fixes remaining in the tree."

Fix trivial conflict in kernel/irq/manage.c: the merge of Andrew's pile
had brought in commit 97fd75b7 ("kernel/irq/manage.c: use the
pr_foo() infrastructure to prefix printks") which changed one of the
pr_err() calls that this merge moves around.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  keys: kill task_struct->replacement_session_keyring
  keys: kill the dummy key_replace_session_keyring()
  keys: change keyctl_session_to_parent() to use task_work_add()
  genirq: reimplement exit_irq_thread() hook via task_work_add()
  task_work_add: generic process-context callbacks
  avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers
  parisc: need to check NOTIFY_RESUME when exiting from syscall
  move key_repace_session_keyring() into tracehook_notify_resume()
  TIF_NOTIFY_RESUME is defined on all targets now
parents a00b6151 f23ca335

arch/alpha/kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -590,7 +590,5 @@ do_notify_resume(struct pt_regs *regs, struct switch_stack *sw, 
	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

}

arch/arm/kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -679,7 +679,5 @@ do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall) 
	if (thread_flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

}

arch/avr32/kernel/entry-avr32b.S

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ fault_exit_work: 
	ld.w	r1, r0[TI_flags]

	rjmp	fault_exit_work



1:	mov	r2, _TIF_SIGPENDING | _TIF_RESTORE_SIGMASK

1:	mov	r2, _TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NOTIFY_RESUME

	tst	r1, r2

	breq	2f

	unmask_interrupts

arch/avr32/kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -321,7 +321,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) 
	if (ti->flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

}

arch/blackfin/kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -336,8 +336,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs) 
	if (test_thread_flag(TIF_NOTIFY_RESUME)) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE