summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-01-16 11:23:29 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2012-01-16 11:33:49 -0800
commit2dac8e54f988ab58525505d7ef982493374433c3 (patch)
treea36ddf3790f984c8331b6d44bc1baa0f08c6a842 /drivers/char
parent3e88bdff1c65145f7ba297ccec69c774afe4c785 (diff)
downloadlinux-2dac8e54f988ab58525505d7ef982493374433c3.tar.bz2
random: Adjust the number of loops when initializing
When we are initializing using arch_get_random_long() we only need to loop enough times to touch all the bytes in the buffer; using poolwords for that does twice the number of operations necessary on a 64-bit machine, since in the random number generator code "word" means 32 bits. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: "Theodore Ts'o" <tytso@mit.edu> Link: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-tytso@mit.edu
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 30794779c523..9a2156d77629 100644
--- a/drivers/char/random.c
+++ b/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));