summaryrefslogtreecommitdiffstats
path: root/kernel/time/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/time/timer.c')
-rw-r--r--kernel/time/timer.c6
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)
1284EXPORT_SYMBOL(del_timer_sync); 1284EXPORT_SYMBOL(del_timer_sync);
1285#endif 1285#endif
1286 1286
1287static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long)) 1287static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *))
1288{ 1288{
1289 int count = preempt_count(); 1289 int count = preempt_count();
1290 1290
@@ -1308,7 +1308,7 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long))
1308 lock_map_acquire(&lockdep_map); 1308 lock_map_acquire(&lockdep_map);
1309 1309
1310 trace_timer_expire_entry(timer); 1310 trace_timer_expire_entry(timer);
1311 fn((TIMER_DATA_TYPE)timer); 1311 fn(timer);
1312 trace_timer_expire_exit(timer); 1312 trace_timer_expire_exit(timer);
1313 1313
1314 lock_map_release(&lockdep_map); 1314 lock_map_release(&lockdep_map);
@@ -1330,7 +1330,7 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
1330{ 1330{
1331 while (!hlist_empty(head)) { 1331 while (!hlist_empty(head)) {
1332 struct timer_list *timer; 1332 struct timer_list *timer;
1333 void (*fn)(unsigned long); 1333 void (*fn)(struct timer_list *);
1334 1334
1335 timer = hlist_entry(head->first, struct timer_list, entry); 1335 timer = hlist_entry(head->first, struct timer_list, entry);
1336 1336