diff options
| -rw-r--r-- | include/trace/events/timer.h | 7 | ||||
| -rw-r--r-- | kernel/time/hrtimer.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h index a54613f59e55..07cbb9836b91 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h @@ -254,14 +254,13 @@ TRACE_EVENT(hrtimer_start, /** * hrtimer_expire_entry - called immediately before the hrtimer callback * @hrtimer: pointer to struct hrtimer - * @now: pointer to variable which contains current time of the - * timers base. + * @now: variable which contains current time of the timers base. * * Allows to determine the timer latency. */ TRACE_EVENT(hrtimer_expire_entry, - TP_PROTO(struct hrtimer *hrtimer, ktime_t *now), + TP_PROTO(struct hrtimer *hrtimer, ktime_t now), TP_ARGS(hrtimer, now), @@ -273,7 +272,7 @@ TRACE_EVENT(hrtimer_expire_entry, TP_fast_assign( __entry->hrtimer = hrtimer; - __entry->now = *now; + __entry->now = now; __entry->function = ACCESS_PRIVATE(hrtimer, function); ), diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index c7e7d3a0d6bb..a71e2caa1402 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1884,7 +1884,7 @@ EXPORT_SYMBOL_GPL(hrtimer_active); * __run_hrtimer() invocations. */ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base, struct hrtimer_clock_base *base, - struct hrtimer *timer, ktime_t *now, unsigned long flags) + struct hrtimer *timer, ktime_t now, unsigned long flags) __must_hold(&cpu_base->lock) { enum hrtimer_restart (*fn)(struct hrtimer *); @@ -1989,7 +1989,7 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now, if (basenow < hrtimer_get_softexpires(timer)) break; - __run_hrtimer(cpu_base, base, timer, &basenow, flags); + __run_hrtimer(cpu_base, base, timer, basenow, flags); if (active_mask == HRTIMER_ACTIVE_SOFT) hrtimer_sync_wait_running(cpu_base, flags); } |