1. 01 Feb, 2008 1 commit
    • Linus Torvalds's avatar
      Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc · 75659ca0
      Linus Torvalds authored
      * '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..
      75659ca0
  2. 31 Jan, 2008 39 commits