hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2017-10-18 16:10:19 +02:00
parent 32a6c7233c
commit ba16490eac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/time/timer.c
View File

@ -610,7 +610,7 @@ static bool timer_fixup_init(void *addr, enum debug_obj_state state)
} }
/* Stub timer callback for improperly used timers. */ /* 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); WARN_ON(1);
} }
@ -626,7 +626,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state)
switch (state) { switch (state) {
case ODEBUG_STATE_NOTAVAILABLE: case ODEBUG_STATE_NOTAVAILABLE:
setup_timer(timer, stub_timer, 0); timer_setup(timer, stub_timer, 0);
return true; return true;
case ODEBUG_STATE_ACTIVE: case ODEBUG_STATE_ACTIVE:
@ -665,7 +665,7 @@ static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state)
switch (state) { switch (state) {
case ODEBUG_STATE_NOTAVAILABLE: case ODEBUG_STATE_NOTAVAILABLE:
setup_timer(timer, stub_timer, 0); timer_setup(timer, stub_timer, 0);
return true; return true;
default: default:
return false; return false;