41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From cc24dc4f61fbe1cc81675a98baac7ea5f5cec53c Mon Sep 17 00:00:00 2001
|
|
From: Ingo Molnar <mingo@elte.hu>
|
|
Date: Fri, 3 Jul 2009 08:29:30 -0500
|
|
Subject: [PATCH 038/298] drivers: random: Reduce preempt disabled region
|
|
|
|
No need to keep preemption disabled across the whole function.
|
|
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
drivers/char/random.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/char/random.c b/drivers/char/random.c
|
|
index 8ae9235..62d59ed 100644
|
|
--- a/drivers/char/random.c
|
|
+++ b/drivers/char/random.c
|
|
@@ -701,8 +701,11 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
|
|
preempt_disable();
|
|
/* if over the trickle threshold, use only 1 in 4096 samples */
|
|
if (input_pool.entropy_count > trickle_thresh &&
|
|
- ((__this_cpu_inc_return(trickle_count) - 1) & 0xfff))
|
|
- goto out;
|
|
+ ((__this_cpu_inc_return(trickle_count) - 1) & 0xfff)) {
|
|
+ preempt_enable();
|
|
+ return;
|
|
+ }
|
|
+ preempt_enable();
|
|
|
|
sample.jiffies = jiffies;
|
|
sample.cycles = get_cycles();
|
|
@@ -744,8 +747,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
|
|
credit_entropy_bits(&input_pool,
|
|
min_t(int, fls(delta>>1), 11));
|
|
}
|
|
-out:
|
|
- preempt_enable();
|
|
}
|
|
|
|
void add_input_randomness(unsigned int type, unsigned int code,
|