diff options
| author | Fabio Estevam <fabio.estevam@nxp.com> | 2017-01-31 11:36:07 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-02-06 20:46:49 -0500 |
| commit | db61ffe3a71c697aaa91c42c862a5f7557a0e562 (patch) | |
| tree | 5cff81fc4d5d9f22b724390f5cf20fa93ee9eb09 | |
| parent | c440408cf6901eeb2c09563397e24a9097907078 (diff) | |
random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block
Building arm allnodefconfig causes the following build warning:
drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
Fix the warning by moving 'random_min_urandom_seed' declaration inside
the CONFIG_SYSCTL ifdef block, where it is actually used.
While at it, remove the comment prior to the variable declaration.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | drivers/char/random.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 066ae125f2c8..0ab024918907 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -313,11 +313,6 @@ static int random_read_wakeup_bits = 64; | |||
| 313 | static int random_write_wakeup_bits = 28 * OUTPUT_POOL_WORDS; | 313 | static int random_write_wakeup_bits = 28 * OUTPUT_POOL_WORDS; |
| 314 | 314 | ||
| 315 | /* | 315 | /* |
| 316 | * Variable is currently unused by left for user space compatibility. | ||
| 317 | */ | ||
| 318 | static int random_min_urandom_seed = 60; | ||
| 319 | |||
| 320 | /* | ||
| 321 | * Originally, we used a primitive polynomial of degree .poolwords | 316 | * Originally, we used a primitive polynomial of degree .poolwords |
| 322 | * over GF(2). The taps for various sizes are defined below. They | 317 | * over GF(2). The taps for various sizes are defined below. They |
| 323 | * were chosen to be evenly spaced except for the last tap, which is 1 | 318 | * were chosen to be evenly spaced except for the last tap, which is 1 |
| @@ -1886,6 +1881,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, | |||
| 1886 | static int min_read_thresh = 8, min_write_thresh; | 1881 | static int min_read_thresh = 8, min_write_thresh; |
| 1887 | static int max_read_thresh = OUTPUT_POOL_WORDS * 32; | 1882 | static int max_read_thresh = OUTPUT_POOL_WORDS * 32; |
| 1888 | static int max_write_thresh = INPUT_POOL_WORDS * 32; | 1883 | static int max_write_thresh = INPUT_POOL_WORDS * 32; |
| 1884 | static int random_min_urandom_seed = 60; | ||
| 1889 | static char sysctl_bootid[16]; | 1885 | static char sysctl_bootid[16]; |
| 1890 | 1886 | ||
| 1891 | /* | 1887 | /* |
