| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:29:30 -0500 |
| Subject: 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(-) |
| |
| Index: linux-stable/drivers/char/random.c |
| =================================================================== |
| --- linux-stable.orig/drivers/char/random.c |
| +++ linux-stable/drivers/char/random.c |
| @@ -679,9 +679,12 @@ static void add_timer_randomness(struct |
| 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(); |
| sample.num = num; |
| @@ -722,8 +725,6 @@ static void add_timer_randomness(struct |
| 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, |
