diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-08-21 21:08:57 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-08-28 11:50:29 +0200 |
| commit | 99093c5b81f58815fbfc1fe301c87206c6f5f730 (patch) | |
| tree | f4cd5d9292140fe536c43234f59d656b03bb0ef8 /kernel/time | |
| parent | posix-cpu-timers: Use clock ID in posix_cpu_timer_set() (diff) | |
| download | linux-99093c5b81f58815fbfc1fe301c87206c6f5f730.tar.xz linux-99093c5b81f58815fbfc1fe301c87206c6f5f730.zip | |
posix-cpu-timers: Use clock ID in posix_cpu_timer_get()
Extract the clock ID (PROF/VIRT/SCHED) from the clock selector and use it
as argument to the sample functions. That allows to simplify them once all
callers are fixed.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lkml.kernel.org/r/20190821192920.155487201@linutronix.de
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 12561f8ef378..8e4ce8ade88c 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -699,6 +699,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp) { + clockid_t clkid = CPUCLOCK_WHICH(timer->it_clock); struct task_struct *p = timer->it.cpu.task; u64 now; @@ -717,7 +718,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp * Sample the clock to take the difference with the expiry time. */ if (CPUCLOCK_PERTHREAD(timer->it_clock)) { - cpu_clock_sample(timer->it_clock, p, &now); + cpu_clock_sample(clkid, p, &now); } else { struct sighand_struct *sighand; unsigned long flags; @@ -737,7 +738,7 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp timer->it.cpu.expires = 0; return; } else { - cpu_clock_sample_group(timer->it_clock, p, &now, false); + cpu_clock_sample_group(clkid, p, &now, false); unlock_task_sighand(p, &flags); } } |