diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 07:58:04 +0200 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 07:58:04 +0200 |
commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
tree | 0a7d407639876e02deef1721817615eaa8c673a3 /drivers/char/random.c | |
parent | Input: cannot refer to __exit from within __init. (diff) | |
parent | Merge master.kernel.org:~rmk/linux-2.6-arm.git (diff) | |
download | linux-e0d21d9cca25f424f3129649be48a63c128ed42d.tar.xz linux-e0d21d9cca25f424f3129649be48a63c128ed42d.zip |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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; * samples to avoid wasting CPU time and reduce lock contention. */ -static int trickle_thresh = INPUT_POOL_WORDS * 28; +static int trickle_thresh __read_mostly = INPUT_POOL_WORDS * 28; static DEFINE_PER_CPU(int, trickle_count) = 0; |