diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
| commit | ff71abad53cdd1856e6a77ef71a09f1df46c9b87 (patch) | |
| tree | 82f61a0765f7ea45fb6bd87a537bb656eb181601 /drivers/char/random.c | |
| parent | aaca8c6eac21c9a662d87ff0e83eb176af970213 (diff) | |
| parent | b924047fe07689ed9b7f0a8e14826534caaff8fc (diff) | |
Merge remote branch 'percpu/for-next'
Diffstat (limited to 'drivers/char/random.c')
| -rw-r--r-- | drivers/char/random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 5a1aa64f4e76..72a4fcb17745 100644 --- 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; |