diff options
| author | David Howells <dhowells@redhat.com> | 2017-11-13 15:36:33 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-11-13 15:36:33 +0000 |
| commit | 81445e63e67a1e98b1c2575fa2b406d4289d2754 (patch) | |
| tree | 2d121d1873b3e8ec7b71086c4db2f5cb207a46ec /lib/random32.c | |
| parent | ede372dcae15d3ba1d3d52ac45be7a27ce31be28 (diff) | |
| parent | b24591e2fcf852ad7ad2ccf745c8220bf378d312 (diff) | |
| download | linux-81445e63e67a1e98b1c2575fa2b406d4289d2754.tar.bz2 | |
Merge remote-tracking branch 'tip/timers/core' into afs-next
These AFS patches need the timer_reduce() patch from timers/core.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'lib/random32.c')
| -rw-r--r-- | lib/random32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/random32.c b/lib/random32.c index 0a90cb0e0fb6..65cc018fef40 100644 --- a/lib/random32.c +++ b/lib/random32.c @@ -215,7 +215,7 @@ core_initcall(prandom_init); static void __prandom_timer(unsigned long dontcare); -static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0); +static DEFINE_TIMER(seed_timer, __prandom_timer); static void __prandom_timer(unsigned long dontcare) { |