openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/cris/kernel
History
Linus Torvalds fb21affa49 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 97fd75b7b8 ("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
 		2012-05-31 18:47:30 -07:00
..
Makefile arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0 2009-09-20 12:28:22 +02:00
asm-offsets.c drop explicit include of autoconf.h 2009-12-12 13:08:15 +01:00
crisksyms.c Generic semaphore implementation 2008-04-17 10:42:34 -04:00
irq.c Disintegrate asm/system.h for CRIS 2012-03-28 18:30:02 +01:00
module.c modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
process.c cris: Use generic init_task 2012-05-05 13:00:22 +02:00
profile.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
ptrace.c move key_repace_session_keyring() into tracehook_notify_resume() 2012-05-23 22:09:20 -04:00
setup.c Disintegrate asm/system.h for CRIS 2012-03-28 18:30:02 +01:00
sys_cris.c Add generic sys_ipc wrapper 2010-03-12 15:52:32 -08:00
time.c CRIS: Remove legacy RTC drivers 2012-04-05 11:55:58 +02:00
traps.c Disintegrate asm/system.h for CRIS 2012-03-28 18:30:02 +01:00
vmlinux.lds.S CRIS: Add _sdata to vmlinux.lds.S 2012-04-03 13:26:33 +02:00