diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 03:47:14 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 03:47:14 -0500 |
| commit | adf1795caca2dab919e4a80062825433f2874ae5 (patch) | |
| tree | 5061679bd9125c31238de4bc86b303e21ed6b4a8 | |
| parent | 3deb98d8343c7b9274226d3d9c863858161abe4a (diff) | |
| download | 4.9-rt-patches-adf1795caca2dab919e4a80062825433f2874ae5.tar.gz | |
random: import refresh for __latent_entropy annotations
| -rw-r--r-- | patches/random-make-it-work-on-rt.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/random-make-it-work-on-rt.patch b/patches/random-make-it-work-on-rt.patch index 868344527f364..8e66a85089c38 100644 --- a/patches/random-make-it-work-on-rt.patch +++ b/patches/random-make-it-work-on-rt.patch @@ -76,7 +76,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h -@@ -64,6 +64,7 @@ struct irq_desc { +@@ -66,6 +66,7 @@ struct irq_desc { unsigned int irqs_unhandled; atomic_t threads_handled; int threads_handled_last; @@ -86,12 +86,12 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> const struct cpumask *percpu_affinity; --- a/include/linux/random.h +++ b/include/linux/random.h -@@ -20,7 +20,7 @@ struct random_ready_callback { - extern void add_device_randomness(const void *, unsigned int); +@@ -31,7 +31,7 @@ static inline void add_latent_entropy(vo + extern void add_input_randomness(unsigned int type, unsigned int code, - unsigned int value); --extern void add_interrupt_randomness(int irq, int irq_flags); -+extern void add_interrupt_randomness(int irq, int irq_flags, __u64 ip); + unsigned int value) __latent_entropy; +-extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy; ++extern void add_interrupt_randomness(int irq, int irq_flags, __u64 ip) __latent_entropy; extern void get_random_bytes(void *buf, int nbytes); extern int add_random_ready_callback(struct random_ready_callback *rdy); |