diff options
| author | Andy Lutomirski <luto@kernel.org> | 2019-12-23 11:20:51 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-01-08 00:07:01 +0300 |
| commit | c95ea0c69ffda19381c116db2be23c7e654dac98 (patch) | |
| tree | e5e9f824c1b219d95272de5c9a74e19c12cc7522 /drivers/char/random.c | |
| parent | 84df7cdfbb215a34657b39f4257dab739efa2df9 (diff) | |
| download | linux-c95ea0c69ffda19381c116db2be23c7e654dac98.tar.xz | |
random: remove kernel.random.read_wakeup_threshold
It has no effect any more, so remove it. We can revert this if
there is some user code that expects to be able to set this sysctl.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/a74ed2cf0b5a5451428a246a9239f5bc4e29358f.1577088521.git.luto@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'drivers/char/random.c')
| -rw-r--r-- | drivers/char/random.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 1a36a594dc2e..b68da8eefcdb 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -370,12 +370,6 @@ #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT) /* - * The minimum number of bits of entropy before we wake up a read on - * /dev/random. Should be enough to do a significant reseed. - */ -static int random_read_wakeup_bits = 64; - -/* * If the entropy count falls under this number of bits, then we * should wake up processes which are selecting or polling on write * access to /dev/random. @@ -2054,8 +2048,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, #include <linux/sysctl.h> -static int min_read_thresh = 8, min_write_thresh; -static int max_read_thresh = OUTPUT_POOL_WORDS * 32; +static int min_write_thresh; static int max_write_thresh = INPUT_POOL_WORDS * 32; static int random_min_urandom_seed = 60; static char sysctl_bootid[16]; @@ -2131,15 +2124,6 @@ struct ctl_table random_table[] = { .data = &input_pool.entropy_count, }, { - .procname = "read_wakeup_threshold", - .data = &random_read_wakeup_bits, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = &min_read_thresh, - .extra2 = &max_read_thresh, - }, - { .procname = "write_wakeup_threshold", .data = &random_write_wakeup_bits, .maxlen = sizeof(int), |