diff --git a/fs/pipe.c b/fs/pipe.c index 6b3d91a691bf146edeeb7934a366e6ab4c0ff100..f1fa2b412f0e71aea8c44ace43f780e4bdeed754 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -45,8 +45,7 @@ void pipe_wait(struct pipe_inode_info *pipe) * 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(); diff --git a/include/linux/sched.h b/include/linux/sched.h index 47e3717a0356fe1ebfbdb1c757e37a62cf2be1ee..49c7b374eac8b77a8a5fc0ee61092c69464cc371 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -175,8 +175,7 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) #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)