From b53d43335171343a79665baf30bfc05a42c42cca Mon Sep 17 00:00:00 2001
From: Matt Mackall <mpm@selenic.com>
Date: Wed, 6 Feb 2008 01:37:20 -0800
Subject: [PATCH] --- yaml --- r: 83438 b: refs/heads/master c:
 91f3f1e304f2e9ff2c8b9c76efd4fb8ff93110f7 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/random.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d9cc2060b8ed..69e43bba0e63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ab24c79af5a05659f68eae3e5f232c9a15359d7
+refs/heads/master: 91f3f1e304f2e9ff2c8b9c76efd4fb8ff93110f7
diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c
index c511a831f0c0..f43c89f7c449 100644
--- a/trunk/drivers/char/random.c
+++ b/trunk/drivers/char/random.c
@@ -1039,6 +1039,7 @@ write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
 		p += bytes;
 
 		add_entropy_words(r, buf, (bytes + 3) / 4);
+		cond_resched();
 	}
 
 	return 0;