Merge ../torvalds-2.6/

1 files changed, 5 insertions, 1 deletions

diff --git a/fs/pipe.c b/fs/pipe.c
index 2c7a23dde2..66aa0b938d 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -39,7 +39,11 @@ void pipe_wait(struct inode * inode)
 {
         DEFINE_WAIT(wait);
 
-        prepare_to_wait(PIPE_WAIT(*inode), &wait, TASK_INTERRUPTIBLE);
+        /*
+         * Pipes are system-local resources, so sleeping on them
+         * is considered a noninteractive wait:
+         */
+        prepare_to_wait(PIPE_WAIT(*inode), &wait, TASK_INTERRUPTIBLE|TASK_NONINTERACTIVE);
         up(PIPE_SEM(*inode));
         schedule();
         finish_wait(PIPE_WAIT(*inode), &wait);