diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-08-21 21:08:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-08-28 11:50:28 +0200 |
| commit | c7a37c6f4c651a531101c5721814333bae2804ec (patch) | |
| tree | 9028d97eeee7b1b07e8104dbd551bac90e94f005 /kernel/time | |
| parent | posix-cpu-timers: Consolidate thread group sample code (diff) | |
| download | linux-dev-c7a37c6f4c651a531101c5721814333bae2804ec.tar.xz linux-dev-c7a37c6f4c651a531101c5721814333bae2804ec.zip | |
posix-cpu-timers: Use clock ID in posix_cpu_timer_set()
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.050770464@linutronix.de
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index a9003b2d614d..12561f8ef378 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -556,10 +556,11 @@ static void cpu_timer_fire(struct k_itimer *timer) static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, struct itimerspec64 *new, struct itimerspec64 *old) { - unsigned long flags; - struct sighand_struct *sighand; - struct task_struct *p = timer->it.cpu.task; + clockid_t clkid = CPUCLOCK_WHICH(timer->it_clock); u64 old_expires, new_expires, old_incr, val; + struct task_struct *p = timer->it.cpu.task; + struct sighand_struct *sighand; + unsigned long flags; int ret; if (WARN_ON_ONCE(!p)) @@ -606,9 +607,9 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, * check if it's already passed. In short, we need a sample. */ if (CPUCLOCK_PERTHREAD(timer->it_clock)) { - cpu_clock_sample(timer->it_clock, p, &val); + cpu_clock_sample(clkid, p, &val); } else { - cpu_clock_sample_group(timer->it_clock, p, &val, true); + cpu_clock_sample_group(clkid, p, &val, true); } if (old) { |