Merge v5.0-rc7 into drm-next

[sfrench/cifs-2.6.git] / lib / random32.c

diff --git a/lib/random32.c b/lib/random32.c
index 0a90cb0e0fb65f8480c398a7d2e0b42d1c6ef885..4aaa76404d561b86609bbd1c6eb3ca4620ca81bf 100644 (file)
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -213,11 +213,11 @@ static int __init prandom_init(void)
 }
 core_initcall(prandom_init);
 
-static void __prandom_timer(unsigned long dontcare);
+static void __prandom_timer(struct timer_list *unused);
 
-static DEFINE_TIMER(seed_timer, __prandom_timer, 0, 0);
+static DEFINE_TIMER(seed_timer, __prandom_timer);
 
-static void __prandom_timer(unsigned long dontcare)
+static void __prandom_timer(struct timer_list *unused)
 {
        u32 entropy;
        unsigned long expires;