Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This reverts a number of changes to the khwrng thread which feeds the
kernel random number pool from hwrng drivers. They were trying to fix
issues with suspend-and-resume but ended up causing regressions"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "hwrng: core - Freeze khwrng thread during suspend"
+2
-7
+1
-4
drivers/char/hw_random/core.c
+1
-4
drivers/char/hw_random/core.c
···
13
13
#include <linux/delay.h>
14
14
#include <linux/device.h>
15
15
#include <linux/err.h>
16
-
#include <linux/freezer.h>
17
16
#include <linux/fs.h>
18
17
#include <linux/hw_random.h>
19
18
#include <linux/kernel.h>
···
421
422
{
422
423
long rc;
423
424
424
-
set_freezable();
425
-
426
-
while (!kthread_freezable_should_stop(NULL)) {
425
+
while (!kthread_should_stop()) {
427
426
struct hwrng *rng;
428
427
429
428
rng = get_current_rng();
+1
-3
drivers/char/random.c
+1
-3
drivers/char/random.c
···
327
327
#include <linux/percpu.h>
328
328
#include <linux/cryptohash.h>
329
329
#include <linux/fips.h>
330
-
#include <linux/freezer.h>
331
330
#include <linux/ptrace.h>
332
331
#include <linux/workqueue.h>
333
332
#include <linux/irq.h>
···
2499
2500
* We'll be woken up again once below random_write_wakeup_thresh,
2500
2501
* or when the calling thread is about to terminate.
2501
2502
*/
2502
-
wait_event_freezable(random_write_wait,
2503
-
kthread_should_stop() ||
2503
+
wait_event_interruptible(random_write_wait, kthread_should_stop() ||
2504
2504
ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
2505
2505
mix_pool_bytes(poolp, buffer, count);
2506
2506
credit_entropy_bits(poolp, entropy);