---

yaml --- r: 145570 b: refs/heads/master c: 2b83868 h: refs/heads/master v: v3
git-mirror · Jun 10, 2009 · 80a9794 · 80a9794
1 parent d385dba
commit 80a9794
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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();