summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-10-05 15:51:06 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-10-05 15:51:06 -0400
commit1de87d43aebc387ecfe2ab784db29cd6e08ec87b (patch)
tree8276a84995b4cb91e60886e67fa3a8f47b321946
parent999efd2b90777a53c1509de040a6061ca832a217 (diff)
download4.12-rt-patches-1de87d43aebc387ecfe2ab784db29cd6e08ec87b.tar.gz
random: refresh #3rt-v4.12-rc5
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--patches/char-random-don-t-print-that-the-init-is-done.patch10
1 files changed, 5 insertions, 5 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 0a810cc5020e9c..5f2e2181466e62 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,4 +1,4 @@
-From 666dd4fbe071f9848b1a708ad41f09ce68127da5 Mon Sep 17 00:00:00 2001
+From a7f85f191b9eb24401a3b13bd580ea5d2ad43f7c Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 30 May 2017 16:39:01 +0200
Subject: [PATCH] char/random: don't print that the init is done
@@ -143,11 +143,11 @@ also could skip it.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 723b3b320f0a..faace6fbb536 100644
+index 2267cebadf63..deab4608f89a 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
-@@ -802,7 +802,7 @@ static int crng_fast_load(const char *cp, size_t len)
- if (crng_init_cnt >= CRNG_INIT_CNT_THRESH) {
+@@ -808,7 +808,7 @@ static int crng_fast_load(const char *cp, size_t len)
+ invalidate_batched_entropy();
crng_init = 1;
wake_up_interruptible(&crng_init_wait);
- pr_notice("random: fast init done\n");
@@ -155,7 +155,7 @@ index 723b3b320f0a..faace6fbb536 100644
}
spin_unlock_irqrestore(&primary_crng.lock, flags);
return 1;
-@@ -840,7 +840,7 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r)
+@@ -847,7 +847,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);