diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-23 04:15:40 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-11-22 00:57:13 +0100 |
| commit | 354b46b1a0adda1dd5b7f0bc2a5604cca091be5f (patch) | |
| tree | 337614b13dad20aa1c591c4392ca1302d322096a /kernel | |
| parent | timer: Pass timer_list pointer to callbacks unconditionally (diff) | |
| download | linux-354b46b1a0adda1dd5b7f0bc2a5604cca091be5f.tar.xz linux-354b46b1a0adda1dd5b7f0bc2a5604cca091be5f.zip | |
timer: Switch callback prototype to take struct timer_list * argument
Since all callbacks have been converted, we can switch the core
prototype to "struct timer_list *" now too.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: 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 a07eb124332f..0f0d49a02d04 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1284,7 +1284,7 @@ int del_timer_sync(struct timer_list *timer) EXPORT_SYMBOL(del_timer_sync); #endif -static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long)) +static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *)) { int count = preempt_count(); @@ -1308,7 +1308,7 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long)) lock_map_acquire(&lockdep_map); trace_timer_expire_entry(timer); - fn((TIMER_DATA_TYPE)timer); + fn(timer); trace_timer_expire_exit(timer); lock_map_release(&lockdep_map); @@ -1330,7 +1330,7 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head) { while (!hlist_empty(head)) { struct timer_list *timer; - void (*fn)(unsigned long); + void (*fn)(struct timer_list *); timer = hlist_entry(head->first, struct timer_list, entry); |