Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53c3f63e authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds
Browse files

random: reuse rand_initialize 



Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43ae4860

drivers/char/random.c

+2 −4
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ static void init_std_data(struct entropy_store *r) 
			  sizeof(*(utsname()))/4);

}



static int __init rand_initialize(void)

static int rand_initialize(void)

{

	init_std_data(&input_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. */

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		init_std_data(&input_pool);

		init_std_data(&blocking_pool);

		init_std_data(&nonblocking_pool);

		rand_initialize();

		return 0;

	default:

		return -EINVAL;