hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6BB CVE: NA
--------------------------------
This reverts commit f153e320d3a74b88f2eac745aeac65d2d3e1c3e7.
The patch f153e320d3a7 ("alinux: random: speed up the initialization of module") will lead to many conflicts while backport 5.10.119 LTS patches, revert it temporarily.
Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com Acked-by: Xie XiuQi xiexiuqi@huawei.com --- drivers/char/random.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c index 8f29cbc0849e..2f18378038ec 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1309,8 +1309,7 @@ void add_interrupt_randomness(int irq, int irq_flags) }
if ((fast_pool->count < 64) && - !time_after(now, fast_pool->last + HZ) && - crng_ready()) + !time_after(now, fast_pool->last + HZ)) return;
r = &input_pool;