From bf79b11da4b5255243a6a3508d227d82b9f9f36d Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Mon, 16 Jan 2012 11:23:29 -0800
Subject: [PATCH] --- yaml --- r: 285925 b: refs/heads/master c:
 2dac8e54f988ab58525505d7ef982493374433c3 h: refs/heads/master i:   285923:
 c5b7ad102079020c591d3541bab263c2c715a6f8 v: v3

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

diff --git a/[refs] b/[refs]
index 92c813f7d125..99a240bd0437 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e88bdff1c65145f7ba297ccec69c774afe4c785
+refs/heads/master: 2dac8e54f988ab58525505d7ef982493374433c3
diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c
index 30794779c523..9a2156d77629 100644
--- a/trunk/drivers/char/random.c
+++ b/trunk/drivers/char/random.c
@@ -975,7 +975,7 @@ static void init_std_data(struct entropy_store *r)
 
 	now = ktime_get_real();
 	mix_pool_bytes(r, &now, sizeof(now));
-	for (i = r->poolinfo->poolwords; i; i--) {
+	for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof flags) {
 		if (!arch_get_random_long(&flags))
 			break;
 		mix_pool_bytes(r, &flags, sizeof(flags));