2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ From: H. Peter Anvin <h...@linux.intel.com> 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 <h...@linux.intel.com> Cc: "Theodore Ts'o" <ty...@mit.edu> Link: http://lkml.kernel.org/r/1324589281-31931-1-git-send-email-ty...@mit.edu Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com> Signed-off-by: Willy Tarreau <w...@1wt.eu> --- 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 d67890f..5e106b1 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)); -- 1.7.2.1.45.g54fbc -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
