diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:02:47 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:02:47 +0400 |
| commit | dfc568e6bc08916f1035af456e4631c47166b5cf (patch) | |
| tree | 3c96bdc26687e0f6958e790c8c93c0c6efb6b8d6 /include/linux/random.h | |
| parent | fdf91dae6f024c6dfee425fe754df6b1957f6c53 (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| download | linux-dfc568e6bc08916f1035af456e4631c47166b5cf.tar.xz | |
Merge 3.12-rc6 into char-misc-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/random.h')
| -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 3b9377d6b7a5..6312dd9ba449 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -17,6 +17,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags); extern void get_random_bytes(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes); void generate_random_uuid(unsigned char uuid_out[16]); +extern int random_int_secret_init(void); #ifndef MODULE extern const struct file_operations random_fops, urandom_fops; |