diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-18 16:10:19 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-18 17:04:25 +0200 |
commit | ba16490eac146ebb178017e5de3d61c645552fab (patch) | |
tree | 4e7e7b47ed856567e9ba042b9aae5dc24ca51baa /kernel | |
parent | 32a6c7233c41216f5dd41fc7bf100eedb1063dfc (diff) | |
download | linux-stable-ba16490eac146ebb178017e5de3d61c645552fab.tar.gz linux-stable-ba16490eac146ebb178017e5de3d61c645552fab.tar.bz2 linux-stable-ba16490eac146ebb178017e5de3d61c645552fab.zip |
timer: Convert stub timer to timer_setup()
In preparation for unconditionally passing the struct timer_list pointer
to all timer callbacks, switch to using the new timer_setup() and
from_timer() to pass the timer pointer explicitly.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index ee1a88d8afb2..fbb1f85327bf 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -610,7 +610,7 @@ static bool timer_fixup_init(void *addr, enum debug_obj_state state) } /* Stub timer callback for improperly used timers. */ -static void stub_timer(unsigned long data) +static void stub_timer(struct timer_list *unused) { WARN_ON(1); } @@ -626,7 +626,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state) switch (state) { case ODEBUG_STATE_NOTAVAILABLE: - setup_timer(timer, stub_timer, 0); + timer_setup(timer, stub_timer, 0); return true; case ODEBUG_STATE_ACTIVE: @@ -665,7 +665,7 @@ static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state) switch (state) { case ODEBUG_STATE_NOTAVAILABLE: - setup_timer(timer, stub_timer, 0); + timer_setup(timer, stub_timer, 0); return true; default: return false; |