diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-01-16 11:23:29 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 12:04:12 -0700 |
| commit | a5914eb0c34cf8b2d777c3dca852b2595dec908c (patch) | |
| tree | f45876ad029b8b2bf8783a353239d38273db1eea /drivers/char | |
| parent | d191959fa812fadb86b52f16aa09a49fe6db98dd (diff) | |
| download | kernel_samsung_smdk4412-a5914eb0c34cf8b2d777c3dca852b2595dec908c.zip kernel_samsung_smdk4412-a5914eb0c34cf8b2d777c3dca852b2595dec908c.tar.gz kernel_samsung_smdk4412-a5914eb0c34cf8b2d777c3dca852b2595dec908c.tar.bz2 | |
random: Adjust the number of loops when initializing
commit 2dac8e54f988ab58525505d7ef982493374433c3 upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index fddfc42..1eeb22f 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)); |