lkml.org 
[lkml]   [2019]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: timers/core] posix-cpu-timers: Use clock ID in posix_cpu_timer_get()
    The following commit has been merged into the timers/core branch of tip:

    Commit-ID: 99093c5b81f58815fbfc1fe301c87206c6f5f730
    Gitweb: https://git.kernel.org/tip/99093c5b81f58815fbfc1fe301c87206c6f5f730
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 21 Aug 2019 21:08:57 +02:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Wed, 28 Aug 2019 11:50:29 +02:00

    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

    ---
    kernel/time/posix-cpu-timers.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
    index 12561f8..8e4ce8a 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);
    }
    }
    \
     
     \ /
      Last update: 2019-08-28 12:18    [W:4.275 / U:0.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site