diff options
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/clocksource.c | 2 | ||||
-rw-r--r-- | kernel/time/tick-sched.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 2e949cc9c9f1..b79f39bda7e1 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -792,7 +792,7 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq) | |||
792 | /* Initialize mult/shift and max_idle_ns */ | 792 | /* Initialize mult/shift and max_idle_ns */ |
793 | __clocksource_updatefreq_scale(cs, scale, freq); | 793 | __clocksource_updatefreq_scale(cs, scale, freq); |
794 | 794 | ||
795 | /* Add clocksource to the clcoksource list */ | 795 | /* Add clocksource to the clocksource list */ |
796 | mutex_lock(&clocksource_mutex); | 796 | mutex_lock(&clocksource_mutex); |
797 | clocksource_enqueue(cs); | 797 | clocksource_enqueue(cs); |
798 | clocksource_enqueue_watchdog(cs); | 798 | clocksource_enqueue_watchdog(cs); |
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 1f4356037a7d..4d54b7540585 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -235,7 +235,7 @@ void tick_nohz_full_kick(void) | |||
235 | if (!tick_nohz_full_cpu(smp_processor_id())) | 235 | if (!tick_nohz_full_cpu(smp_processor_id())) |
236 | return; | 236 | return; |
237 | 237 | ||
238 | irq_work_queue(&__get_cpu_var(nohz_full_kick_work)); | 238 | irq_work_queue(this_cpu_ptr(&nohz_full_kick_work)); |
239 | } | 239 | } |
240 | 240 | ||
241 | /* | 241 | /* |