Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 5a1aa64f4e76c5b9178dbb9d3ef4fe9285ed8791..72a4fcb1774509a5e624cf4bc72805cb041e4d28 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -626,7 +626,7 @@ 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))
+           ((__this_cpu_inc_return(trickle_count) - 1) & 0xfff))
                goto out;
 
        sample.jiffies = jiffies;