Remove the TASK_NONINTERACTIVE flag as it will no longer be used. Signed-off-by: Con Kolivas --- fs/pipe.c | 7 +------ include/linux/sched.h | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) Index: linux-2.6.21-rc3-ck1/fs/pipe.c =================================================================== --- linux-2.6.21-rc3-ck1.orig/fs/pipe.c 2007-03-07 21:20:36.000000000 +1100 +++ linux-2.6.21-rc3-ck1/fs/pipe.c 2007-03-07 21:21:44.000000000 +1100 @@ -41,12 +41,7 @@ void pipe_wait(struct pipe_inode_info *p { DEFINE_WAIT(wait); - /* - * Pipes are system-local resources, so sleeping on them - * is considered a noninteractive wait: - */ - prepare_to_wait(&pipe->wait, &wait, - TASK_INTERRUPTIBLE | TASK_NONINTERACTIVE); + prepare_to_wait(&pipe->wait, &wait, TASK_INTERRUPTIBLE); if (pipe->inode) mutex_unlock(&pipe->inode->i_mutex); schedule(); Index: linux-2.6.21-rc3-ck1/include/linux/sched.h =================================================================== --- linux-2.6.21-rc3-ck1.orig/include/linux/sched.h 2007-03-07 21:20:37.000000000 +1100 +++ linux-2.6.21-rc3-ck1/include/linux/sched.h 2007-03-07 21:21:44.000000000 +1100 @@ -149,8 +149,7 @@ extern unsigned long weighted_cpuload(co #define EXIT_ZOMBIE 16 #define EXIT_DEAD 32 /* in tsk->state again */ -#define TASK_NONINTERACTIVE 64 -#define TASK_DEAD 128 +#define TASK_DEAD 64 #define __set_task_state(tsk, state_value) \ do { (tsk)->state = (state_value); } while (0)