Commit 58c81852 authored by Thomas Gleixner's avatar Thomas Gleixner

Merge branch 'rt/drivers-char' into rt/base

parents 36d6b375 be791b93
......@@ -623,8 +623,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 &&
(__get_cpu_var(trickle_count)++ & 0xfff))
goto out;
(__get_cpu_var(trickle_count)++ & 0xfff)) {
preempt_enable();
return;
}
preempt_enable();
sample.jiffies = jiffies;
sample.cycles = get_cycles();
......@@ -666,8 +669,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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment