diff --git a/[refs] b/[refs] index 4ab0bda06cc5..f712359760ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4237003cff66084ebeb502412d9cee392e6f52f +refs/heads/master: cbc96b7594b5691d61eba2db8b2ea723645be9ca diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c index 9793b40f5754..1a2dfa816041 100644 --- a/trunk/drivers/char/random.c +++ b/trunk/drivers/char/random.c @@ -1087,6 +1087,16 @@ static void init_std_data(struct entropy_store *r) mix_pool_bytes(r, utsname(), sizeof(*(utsname())), NULL); } +/* + * Note that setup_arch() may call add_device_randomness() + * long before we get here. This allows seeding of the pools + * with some platform dependent data very early in the boot + * process. But it limits our options here. We must use + * statically allocated structures that already have all + * initializations complete at compile time. We should also + * take care not to overwrite the precious per platform data + * we were given. + */ static int rand_initialize(void) { init_std_data(&input_pool);