diff options
| -rw-r--r-- | include/linux/timer.h | 2 | ||||
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | kernel/time/timer.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 68cf8e28bbe0..153d07dad3cd 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -168,7 +168,7 @@ extern int timer_delete(struct timer_list *timer); extern int timer_shutdown_sync(struct timer_list *timer); extern int timer_shutdown(struct timer_list *timer); -extern void init_timers(void); +extern void timers_init(void); struct hrtimer; extern enum hrtimer_restart it_real_fn(struct hrtimer *); diff --git a/init/main.c b/init/main.c index 7f0a2a3dbd29..bf9c5d22953b 100644 --- a/init/main.c +++ b/init/main.c @@ -1002,7 +1002,7 @@ void start_kernel(void) init_IRQ(); tick_init(); rcu_init_nohz(); - init_timers(); + timers_init(); srcu_init(); hrtimers_init(); softirq_init(); diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 11c6a11a3569..012b9190e859 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2612,7 +2612,7 @@ static void __init init_timer_cpus(void) init_timer_cpu(cpu); } -void __init init_timers(void) +void __init timers_init(void) { init_timer_cpus(); posix_cputimers_init_work(); |