diff options
author | Linus Torvalds | 2019-05-08 06:42:23 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-05-08 06:42:23 +0200 |
commit | dd5001e21a991b731d659857cd07acc7a13e6789 (patch) | |
tree | 42dd4fa7386242e4d728307519dbc6d9435c3575 /include/linux | |
parent | Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt (diff) | |
parent | random: add a spinlock_t to struct batched_entropy (diff) | |
download | kernel-qcow2-linux-dd5001e21a991b731d659857cd07acc7a13e6789.tar.gz kernel-qcow2-linux-dd5001e21a991b731d659857cd07acc7a13e6789.tar.xz kernel-qcow2-linux-dd5001e21a991b731d659857cd07acc7a13e6789.zip |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull randomness updates from Ted Ts'o:
- initialize the random driver earler
- fix CRNG initialization when we trust the CPU's RNG on NUMA systems
- other miscellaneous cleanups and fixes.
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
random: add a spinlock_t to struct batched_entropy
random: document get_random_int() family
random: fix CRNG initialization when random.trust_cpu=1
random: move rand_initialize() earlier
random: only read from /dev/random after its pool has received 128 bits
drivers/char/random.c: make primary_crng static
drivers/char/random.c: remove unused stuct poolinfo::poolbits
drivers/char/random.c: constify poolinfo_table
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/random.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/random.h b/include/linux/random.h index 445a0ea4ff49..13aeaf5a4bd4 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -36,6 +36,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy; extern void get_random_bytes(void *buf, int nbytes); extern int wait_for_random_bytes(void); +extern int __init rand_initialize(void); extern bool rng_is_initialized(void); extern int add_random_ready_callback(struct random_ready_callback *rdy); extern void del_random_ready_callback(struct random_ready_callback *rdy); |