From 80a9794f089f322cac7fc9af95bffa07d5e58555 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jun 2009 20:40:25 -0700
Subject: [PATCH] --- yaml --- r: 145570 b: refs/heads/master c:
 2b83868723d090078ac0e2120e06a1cc94dbaef0 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/mem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cf6db4192a65..61a84df4324d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07a2039b8eb0af4ff464efd3dfd95de5c02648c6
+refs/heads/master: 2b83868723d090078ac0e2120e06a1cc94dbaef0
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 65e12bca657c..f96d0bef855e 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -694,9 +694,8 @@ 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;
+		if (signal_pending(current))
+			return written ? written : -ERESTARTSYS;
 		buf += chunk;
 		count -= chunk;
 		cond_resched();