diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-29 15:22:59 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-29 15:22:59 -0500 |
| commit | 5b748fc1a98b2b78d4a67855120b8e8a28cd3303 (patch) | |
| tree | d9b7a93d8902952a82f13fe25c9ffdb66e210810 | |
| parent | 269e46120b88dd12c382d096c9aa171208cb2e61 (diff) | |
| download | 4.12-rt-patches-5b748fc1a98b2b78d4a67855120b8e8a28cd3303.tar.gz | |
random: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/random-make-it-work-on-rt.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/random-make-it-work-on-rt.patch b/patches/random-make-it-work-on-rt.patch index 042c77fd7a97f..cf63d23114c52 100644 --- a/patches/random-make-it-work-on-rt.patch +++ b/patches/random-make-it-work-on-rt.patch @@ -1,4 +1,4 @@ -From 014bf4d22f789fe5c823766190bad45288307ccc Mon Sep 17 00:00:00 2001 +From f5f930389ce6685b097ab93e65a743ff0e83d9f8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 21 Aug 2012 20:38:50 +0200 Subject: [PATCH] random: Make it work on rt @@ -11,10 +11,10 @@ entropy. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> diff --git a/drivers/char/random.c b/drivers/char/random.c -index 9624b6eed510..9afeb4d6cf6d 100644 +index 789b3b14ac15..d7f44305e33e 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -1106,28 +1106,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs) +@@ -1108,28 +1108,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs) return *ptr; } @@ -83,7 +83,7 @@ index c9be57931b58..eeeb540971ae 100644 struct cpumask *percpu_enabled; const struct cpumask *percpu_affinity; diff --git a/include/linux/random.h b/include/linux/random.h -index ed5c3838780d..723eea8f53a1 100644 +index 4aecc339558d..fc779c086593 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -31,7 +31,7 @@ static inline void add_latent_entropy(void) {} @@ -94,7 +94,7 @@ index ed5c3838780d..723eea8f53a1 100644 +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); + extern int wait_for_random_bytes(void); diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index d3f24905852c..f87aa8fdcc51 100644 --- a/kernel/irq/handle.c @@ -118,7 +118,7 @@ index d3f24905852c..f87aa8fdcc51 100644 if (!noirqdebug) note_interrupt(desc, retval); diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c -index f08ff53596ce..9a622877711e 100644 +index 71c6dfd366af..6346a1f3d15b 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1025,6 +1025,12 @@ static int irq_thread(void *data) @@ -135,5 +135,5 @@ index f08ff53596ce..9a622877711e 100644 } -- -2.1.4 +2.15.0 |