Merge ../torvalds-2.6/

[linux-2.6-omap-h63xx.git] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 2c7a23dde2d83f1ae18190e5723c0eb8d8ae0548..66aa0b938d6aca876bf2d246462c5fa2e3586e8b 100644 (file)
--- 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);