Merge branch 'topic/pcm-jiffies-check' into for-linus

[mv-sheeva.git] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 8f05c38c2f0636c548e857218448556e8ecf76de..65e12bca657cfa0ba14f842ce6b442411f68bca6 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -694,6 +694,9 @@ static ssize_t read_zero(struct file * file, char __user * buf,
                written += chunk - unwritten;
                if (unwritten)
                        break;
+               /* Consider changing this to just 'signal_pending()' with lots of testing */
+               if (fatal_signal_pending(current))
+                       return written ? written : -EINTR;
                buf += chunk;
                count -= chunk;
                cond_resched();