diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-11 03:23:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-11 03:23:22 -0700 |
| commit | be9af746e1495d3a288ac6ade2b0abddd69d4a2e (patch) | |
| tree | 08fedc4316d11cf9dabaaf523d61470d1ccea8a3 /fs | |
| parent | af0d5292ffdd656e577c0a502632f53cde6954b7 (diff) | |
| parent | f85e6275a04cac8d1d5b2b57f51c060513b6483a (diff) | |
Merge master.kernel.org:/home/mingo/BK/linux-2.5-sched
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 93630c5c969d..07fcf8bb57c0 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -119,7 +119,7 @@ do_more_read: * writers synchronously that there is more * room. */ - wake_up_interruptible(PIPE_WAIT(*inode)); + wake_up_interruptible_sync(PIPE_WAIT(*inode)); kill_fasync(PIPE_FASYNC_WRITERS(*inode), SIGIO, POLL_OUT); if (!PIPE_EMPTY(*inode)) BUG(); @@ -219,7 +219,7 @@ pipe_write(struct file *filp, const char *buf, size_t count, loff_t *ppos) * is going to give up this CPU, so it doesnt have * to do idle reschedules. */ - wake_up_interruptible(PIPE_WAIT(*inode)); + wake_up_interruptible_sync(PIPE_WAIT(*inode)); kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN); PIPE_WAITING_WRITERS(*inode)++; pipe_wait(inode); |