diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/char/random.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
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 460b5d475edd..6b11d6b2129f 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -271,7 +271,7 @@ static int random_write_wakeup_thresh = 128; | |||
| 271 | * samples to avoid wasting CPU time and reduce lock contention. | 271 | * samples to avoid wasting CPU time and reduce lock contention. |
| 272 | */ | 272 | */ |
| 273 | 273 | ||
| 274 | static int trickle_thresh = INPUT_POOL_WORDS * 28; | 274 | static int trickle_thresh __read_mostly = INPUT_POOL_WORDS * 28; |
| 275 | 275 | ||
| 276 | static DEFINE_PER_CPU(int, trickle_count) = 0; | 276 | static DEFINE_PER_CPU(int, trickle_count) = 0; |
| 277 | 277 | ||