o Merge with Linux 2.1.100.

 o Cleanup the machine dependencies of floppy and rtc.  The driver for
   the Dallas thingy in the Indy is still missing.
 o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
 o Page colouring shit to match the virtual and physical colour of all
   mapped pages.  This tends to produce extreme fragmentation problems,
   so it's deactivated for now.  Users of R4000SC / R4400SC may re-enable
   the code in arch/mips/mm/init.c by removing the definition of
   CONF_GIVE_A_SHIT_ABOUT_COLOURS.  Should get them somewhat further -
   but don't shake to hard ...
 o Fixed ptrace(2)-ing of syscalls, strace is now working again.
 o Fix the interrupt forwarding from the keyboard driver to the psaux
   driver, PS/2 mice are now working on the Indy.  The fix is somewhat
   broken as it prevents generic kernels for Indy and machines which handle
   things different.
 o Things I can't remember.

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/pipe.c b/fs/pipe.c
index cf0c44b6e..62ff29c87 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -54,7 +54,7 @@ static ssize_t pipe_read(struct file * filp, char * buf,
 		}
 	} else while (PIPE_EMPTY(*inode) || PIPE_LOCK(*inode)) {
 		if (PIPE_EMPTY(*inode)) {
-			if (!PIPE_WRITERS(*inode))
+			if (!PIPE_WRITERS(*inode) || !count)
 				return 0;
 		}
 		if (signal_pending(current))