projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.6-rc1' into linux-next
[cascardo/linux.git]
/
include
/
linux
/
random.h
diff --git
a/include/linux/random.h
b/include/linux/random.h
index
8f74538
..
ac621ce
100644
(file)
--- a/
include/linux/random.h
+++ b/
include/linux/random.h
@@
-48,13
+48,13
@@
struct rnd_state {
#ifdef __KERNEL__
#ifdef __KERNEL__
-extern void rand_initialize_irq(int irq);
-
+extern void add_device_randomness(const void *, unsigned int);
extern void add_input_randomness(unsigned int type, unsigned int code,
unsigned int value);
extern void add_input_randomness(unsigned int type, unsigned int code,
unsigned int value);
-extern void add_interrupt_randomness(int irq);
+extern void add_interrupt_randomness(int irq
, int irq_flags
);
extern void get_random_bytes(void *buf, int nbytes);
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]);
#ifndef MODULE
void generate_random_uuid(unsigned char uuid_out[16]);
#ifndef MODULE