Merge branch 'task_killable' of git://git.kernel.org/pub/scm/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..

1 files changed, 1 insertions, 8 deletions

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 099ddb4481c..a69ba80f2df 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -556,14 +556,7 @@ extern void * nfs_root_data(void);
 
 #define nfs_wait_event(clnt, wq, condition)                             \
 ({                                                                      \
-        int __retval = 0;                                               \
-        if (clnt->cl_intr) {                                            \
-                sigset_t oldmask;                                       \
-                rpc_clnt_sigmask(clnt, &oldmask);                       \
-                __retval = wait_event_interruptible(wq, condition);     \
-                rpc_clnt_sigunmask(clnt, &oldmask);                     \
-        } else                                                          \
-                wait_event(wq, condition);                              \
+        int __retval = wait_event_killable(wq, condition);              \
         __retval;                                                       \
 })