summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/tsc.c2
-rw-r--r--include/linux/sched/clock.h4
-rw-r--r--kernel/sched/clock.c4
-rw-r--r--kernel/time/tick-sched.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index c1b16b328abe..a3b544264360 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -182,7 +182,7 @@ static void __set_cyc2ns_scale(unsigned long khz, int cpu, unsigned long long ts
182 c2n->data[1] = data; 182 c2n->data[1] = data;
183 183
184done: 184done:
185 sched_clock_idle_wakeup_event(0); 185 sched_clock_idle_wakeup_event();
186 local_irq_restore(flags); 186 local_irq_restore(flags);
187} 187}
188 188
diff --git a/include/linux/sched/clock.h b/include/linux/sched/clock.h
index 978cbb0af5f3..9c36f0722966 100644
--- a/include/linux/sched/clock.h
+++ b/include/linux/sched/clock.h
@@ -39,7 +39,7 @@ static inline void sched_clock_idle_sleep_event(void)
39{ 39{
40} 40}
41 41
42static inline void sched_clock_idle_wakeup_event(u64 delta_ns) 42static inline void sched_clock_idle_wakeup_event(void)
43{ 43{
44} 44}
45 45
@@ -66,7 +66,7 @@ extern u64 __sched_clock_offset;
66extern void sched_clock_tick(void); 66extern void sched_clock_tick(void);
67extern void sched_clock_tick_stable(void); 67extern void sched_clock_tick_stable(void);
68extern void sched_clock_idle_sleep_event(void); 68extern void sched_clock_idle_sleep_event(void);
69extern void sched_clock_idle_wakeup_event(u64 delta_ns); 69extern void sched_clock_idle_wakeup_event(void);
70 70
71/* 71/*
72 * As outlined in clock.c, provides a fast, high resolution, nanosecond 72 * As outlined in clock.c, provides a fast, high resolution, nanosecond
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index f861637f7fdc..750a92c9db7e 100644
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -410,9 +410,9 @@ void sched_clock_idle_sleep_event(void)
410EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event); 410EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event);
411 411
412/* 412/*
413 * We just idled delta nanoseconds (called with irqs disabled): 413 * We just idled; resync with ktime. (called with irqs disabled):
414 */ 414 */
415void sched_clock_idle_wakeup_event(u64 delta_ns) 415void sched_clock_idle_wakeup_event(void)
416{ 416{
417 if (timekeeping_suspended) 417 if (timekeeping_suspended)
418 return; 418 return;
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 64c97fc130c4..9c2dc64e31d8 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -554,7 +554,7 @@ static void tick_nohz_stop_idle(struct tick_sched *ts, ktime_t now)
554 update_ts_time_stats(smp_processor_id(), ts, now, NULL); 554 update_ts_time_stats(smp_processor_id(), ts, now, NULL);
555 ts->idle_active = 0; 555 ts->idle_active = 0;
556 556
557 sched_clock_idle_wakeup_event(0); 557 sched_clock_idle_wakeup_event();
558} 558}
559 559
560static ktime_t tick_nohz_start_idle(struct tick_sched *ts) 560static ktime_t tick_nohz_start_idle(struct tick_sched *ts)