]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 00:45:47 +0000 (11:45 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 00:45:47 +0000 (11:45 +1100)
commit75659ca0c10992dcb39258518368a0f6f56e935d
tree5d014ceb2f10158061a23d0d976f9a613d85e659
parentfbdde7bd274d74729954190f99afcb1e3d9bbfba
parent2dfe485a2c8afa54cb069fcf48476f6c90ea3fdf
Merge branch 'task_killable' of git://git./linux/kernel/git/willy/misc

* 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc: (22 commits)
  Remove commented-out code copied from NFS
  NFS: Switch from intr mount option to TASK_KILLABLE
  Add wait_for_completion_killable
  Add wait_event_killable
  Add schedule_timeout_killable
  Use mutex_lock_killable in vfs_readdir
  Add mutex_lock_killable
  Use lock_page_killable
  Add lock_page_killable
  Add fatal_signal_pending
  Add TASK_WAKEKILL
  exit: Use task_is_*
  signal: Use task_is_*
  sched: Use task_contributes_to_load, TASK_ALL and TASK_NORMAL
  ptrace: Use task_is_*
  power: Use task_is_*
  wait: Use TASK_NORMAL
  proc/base.c: Use task_is_*
  proc/array.c: Use TASK_REPORT
  perfmon: Use task_is_*
  ...

Fixed up conflicts in NFS/sunrpc manually..
23 files changed:
fs/nfs/client.c
fs/nfs/direct.c
fs/nfs/inode.c
fs/nfs/nfs3proc.c
fs/nfs/nfs4proc.c
fs/nfs/pagelist.c
fs/nfs/super.c
fs/nfs/write.c
fs/proc/array.c
fs/proc/base.c
include/linux/nfs_fs.h
include/linux/sched.h
include/linux/sunrpc/clnt.h
include/linux/sunrpc/sched.h
kernel/ptrace.c
kernel/sched.c
kernel/signal.c
kernel/timer.c
mm/filemap.c
net/sunrpc/auth.c
net/sunrpc/clnt.c
net/sunrpc/rpcb_clnt.c
net/sunrpc/sched.c