diff options
-rw-r--r-- | fs/pipe.c | 3 | ||||
-rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 2 insertions, 4 deletions
@@ -45,8 +45,7 @@ void pipe_wait(struct pipe_inode_info *pipe) | |||
45 | * Pipes are system-local resources, so sleeping on them | 45 | * Pipes are system-local resources, so sleeping on them |
46 | * is considered a noninteractive wait: | 46 | * is considered a noninteractive wait: |
47 | */ | 47 | */ |
48 | prepare_to_wait(&pipe->wait, &wait, | 48 | prepare_to_wait(&pipe->wait, &wait, TASK_INTERRUPTIBLE); |
49 | TASK_INTERRUPTIBLE | TASK_NONINTERACTIVE); | ||
50 | if (pipe->inode) | 49 | if (pipe->inode) |
51 | mutex_unlock(&pipe->inode->i_mutex); | 50 | mutex_unlock(&pipe->inode->i_mutex); |
52 | schedule(); | 51 | schedule(); |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 47e3717a0356..49c7b374eac8 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) | |||
175 | #define EXIT_ZOMBIE 16 | 175 | #define EXIT_ZOMBIE 16 |
176 | #define EXIT_DEAD 32 | 176 | #define EXIT_DEAD 32 |
177 | /* in tsk->state again */ | 177 | /* in tsk->state again */ |
178 | #define TASK_NONINTERACTIVE 64 | 178 | #define TASK_DEAD 64 |
179 | #define TASK_DEAD 128 | ||
180 | 179 | ||
181 | #define __set_task_state(tsk, state_value) \ | 180 | #define __set_task_state(tsk, state_value) \ |
182 | do { (tsk)->state = (state_value); } while (0) | 181 | do { (tsk)->state = (state_value); } while (0) |