diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-01-16 11:23:29 -0800 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:41:14 +0200 |
| commit | 16e9e30d537f8385f8d55268530f36775f2eb233 (patch) | |
| tree | 9d29f460379ff85a76657cda64d6160cf0181be5 | |
| parent | 0ce367938392bcdc37481aa39f0da26b297903b4 (diff) | |
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: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 d67890ffc6af..5e106b111d7e 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)); |