diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-06-09 06:19:42 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-06-10 07:14:04 -0400 |
commit | c2719503f5e1e6213d716bb078bdad01e28ebcbf (patch) | |
tree | f4eda27ef5b7ce8798bfaa3dfab7b017f5a6df17 | |
parent | 57225e6797885e31302e76fc5926c0bedd7e5ad4 (diff) |
random: Remove kernel blocking API
This patch removes the kernel blocking API as it has been completely
replaced by the callback API.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/char/random.c | 12 | ||||
-rw-r--r-- | include/linux/random.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index a1576ed1d88e..d0da5d852d41 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -1265,18 +1265,6 @@ void get_random_bytes(void *buf, int nbytes) | |||
1265 | EXPORT_SYMBOL(get_random_bytes); | 1265 | EXPORT_SYMBOL(get_random_bytes); |
1266 | 1266 | ||
1267 | /* | 1267 | /* |
1268 | * Equivalent function to get_random_bytes with the difference that this | ||
1269 | * function blocks the request until the nonblocking_pool is initialized. | ||
1270 | */ | ||
1271 | void get_blocking_random_bytes(void *buf, int nbytes) | ||
1272 | { | ||
1273 | if (unlikely(nonblocking_pool.initialized == 0)) | ||
1274 | wait_event(urandom_init_wait, nonblocking_pool.initialized); | ||
1275 | extract_entropy(&nonblocking_pool, buf, nbytes, 0, 0); | ||
1276 | } | ||
1277 | EXPORT_SYMBOL(get_blocking_random_bytes); | ||
1278 | |||
1279 | /* | ||
1280 | * Add a callback function that will be invoked when the nonblocking | 1268 | * Add a callback function that will be invoked when the nonblocking |
1281 | * pool is initialised. | 1269 | * pool is initialised. |
1282 | * | 1270 | * |
diff --git a/include/linux/random.h b/include/linux/random.h index 30e2aca0b16a..e651874df2c9 100644 --- a/include/linux/random.h +++ b/include/linux/random.h | |||
@@ -21,7 +21,6 @@ extern void add_input_randomness(unsigned int type, unsigned int code, | |||
21 | extern void add_interrupt_randomness(int irq, int irq_flags); | 21 | extern void add_interrupt_randomness(int irq, int irq_flags); |
22 | 22 | ||
23 | extern void get_random_bytes(void *buf, int nbytes); | 23 | extern void get_random_bytes(void *buf, int nbytes); |
24 | extern void get_blocking_random_bytes(void *buf, int nbytes); | ||
25 | extern int add_random_ready_callback(struct random_ready_callback *rdy); | 24 | extern int add_random_ready_callback(struct random_ready_callback *rdy); |
26 | extern void del_random_ready_callback(struct random_ready_callback *rdy); | 25 | extern void del_random_ready_callback(struct random_ready_callback *rdy); |
27 | extern void get_random_bytes_arch(void *buf, int nbytes); | 26 | extern void get_random_bytes_arch(void *buf, int nbytes); |