diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-02 01:23:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-02 01:23:18 -0400 |
| commit | 24539e5b1cb2068f6fa66d8449329752165fcb97 (patch) | |
| tree | bc82aac482db1833d5294d03b6b587434a0f3737 | |
| parent | 4235d8292938d5523d2a7959c97aa6b9c115abbc (diff) | |
| download | 4.12-rt-patches-24539e5b1cb2068f6fa66d8449329752165fcb97.tar.gz | |
refresh char-random-don-t-print-that-the-init-is-done.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/char-random-don-t-print-that-the-init-is-done.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/patches/char-random-don-t-print-that-the-init-is-done.patch b/patches/char-random-don-t-print-that-the-init-is-done.patch index 970b881935d543..0a810cc5020e9c 100644 --- a/patches/char-random-don-t-print-that-the-init-is-done.patch +++ b/patches/char-random-don-t-print-that-the-init-is-done.patch @@ -1,6 +1,7 @@ +From 666dd4fbe071f9848b1a708ad41f09ce68127da5 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue, 30 May 2017 16:39:01 +0200 -Subject: char/random: don't print that the init is done +Subject: [PATCH] char/random: don't print that the init is done On RT we run into circular locking with pendingb_lock (workqueue), port_lock_key (uart) and the primary_crng (random): @@ -140,27 +141,29 @@ It should work if we delay that printk after dropping the lock but we also could skip it. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - drivers/char/random.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/drivers/char/random.c b/drivers/char/random.c +index 723b3b320f0a..faace6fbb536 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -809,7 +809,7 @@ static int crng_fast_load(const char *cp - invalidate_batched_entropy(); +@@ -802,7 +802,7 @@ static int crng_fast_load(const char *cp, size_t len) + if (crng_init_cnt >= CRNG_INIT_CNT_THRESH) { crng_init = 1; wake_up_interruptible(&crng_init_wait); - pr_notice("random: fast init done\n"); + /* pr_notice("random: fast init done\n"); */ } + spin_unlock_irqrestore(&primary_crng.lock, flags); return 1; - } -@@ -848,7 +848,7 @@ static void crng_reseed(struct crng_stat +@@ -840,7 +840,7 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r) crng_init = 2; process_random_ready_list(); wake_up_interruptible(&crng_init_wait); - pr_notice("random: crng init done\n"); + /* pr_notice("random: crng init done\n"); */ } + spin_unlock_irqrestore(&primary_crng.lock, flags); } - +-- +2.1.4 + |