Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux

[karo-tx-linux.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index a1576ed1d88eb4d83ce10d4956e420a527eeb9d1..d0da5d852d41e5588bb9bd192431a403a9696848 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1264,18 +1264,6 @@ void get_random_bytes(void *buf, int nbytes)
 }
 EXPORT_SYMBOL(get_random_bytes);
 
-/*
- * Equivalent function to get_random_bytes with the difference that this
- * function blocks the request until the nonblocking_pool is initialized.
- */
-void get_blocking_random_bytes(void *buf, int nbytes)
-{
-       if (unlikely(nonblocking_pool.initialized == 0))
-               wait_event(urandom_init_wait, nonblocking_pool.initialized);
-       extract_entropy(&nonblocking_pool, buf, nbytes, 0, 0);
-}
-EXPORT_SYMBOL(get_blocking_random_bytes);
-
 /*
  * Add a callback function that will be invoked when the nonblocking
  * pool is initialised.