leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

random: reuse rand_initialize

Browse Source 
Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matt Mackall 2008-04-29 01:02:58 -07:00 committed by Linus Torvalds
parent 43ae4860ff
commit 53c3f63e82
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/random.c
View File

@ -899,7 +899,7 @@ static void init_std_data(struct entropy_store *r)
sizeof(*(utsname()))/4); sizeof(*(utsname()))/4);
} }
static int __init rand_initialize(void) static int rand_initialize(void)
{ {
init_std_data(&input_pool); init_std_data(&input_pool);
init_std_data(&blocking_pool); init_std_data(&blocking_pool);
@ -1101,9 +1101,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
/* Clear the entropy pool counters. */ /* Clear the entropy pool counters. */
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
init_std_data(&input_pool); rand_initialize();
init_std_data(&blocking_pool);
init_std_data(&nonblocking_pool);
return 0; return 0;
default: default:
return -EINVAL; return -EINVAL;