diff options
| -rw-r--r-- | fs/pipe.c | 3 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 6b3d91a691b..f1fa2b412f0 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 47e3717a035..49c7b374eac 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) |