diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/char/random.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/char/random.c')
| -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 5e29e8031bbc..d4ddeba56682 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -732,7 +732,7 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf, | |||
| 732 | size_t nbytes, int min, int rsvd); | 732 | size_t nbytes, int min, int rsvd); |
| 733 | 733 | ||
| 734 | /* | 734 | /* |
| 735 | * This utility inline function is responsible for transfering entropy | 735 | * This utility inline function is responsible for transferring entropy |
| 736 | * from the primary pool to the secondary extraction pool. We make | 736 | * from the primary pool to the secondary extraction pool. We make |
| 737 | * sure we pull enough for a 'catastrophic reseed'. | 737 | * sure we pull enough for a 'catastrophic reseed'. |
| 738 | */ | 738 | */ |