Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320742
b: refs/heads/master
c: cbc96b7
h: refs/heads/master
v: v3
  • Loading branch information
Tony Luck authored and Theodore Ts'o committed Jul 24, 2012
1 parent b1f4942 commit b60d58d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b4237003cff66084ebeb502412d9cee392e6f52f
refs/heads/master: cbc96b7594b5691d61eba2db8b2ea723645be9ca
10 changes: 10 additions & 0 deletions trunk/drivers/char/random.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b60d58d

Please sign in to comment.