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: Remove cputime_expires
    The following commit has been merged into the timers/core branch of tip:

    Commit-ID: 46b883995c88520f2c4de6a64cccc04c69d59f83
    Gitweb: https://git.kernel.org/tip/46b883995c88520f2c4de6a64cccc04c69d59f83
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 21 Aug 2019 21:09:14 +02:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Wed, 28 Aug 2019 11:50:38 +02:00

    posix-cpu-timers: Remove cputime_expires

    The last users of the magic struct cputime based expiry cache are
    gone. Remove the leftovers.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
    Link: https://lkml.kernel.org/r/20190821192921.790209622@linutronix.de

    ---
    include/linux/posix-timers.h | 9 ++-------
    kernel/time/posix-cpu-timers.c | 10 ----------
    2 files changed, 2 insertions(+), 17 deletions(-)

    diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
    index e36c6fd..fd90984 100644
    --- a/include/linux/posix-timers.h
    +++ b/include/linux/posix-timers.h
    @@ -65,19 +65,14 @@ static inline int clockid_to_fd(const clockid_t clk)
    #ifdef CONFIG_POSIX_TIMERS
    /**
    * posix_cputimers - Container for posix CPU timer related data
    - * @cputime_expires: Earliest-expiration cache task_cputime based
    * @expiries: Earliest-expiration cache array based
    * @cpu_timers: List heads to queue posix CPU timers
    *
    * Used in task_struct and signal_struct
    */
    struct posix_cputimers {
    - /* Temporary union until all users are cleaned up */
    - union {
    - struct task_cputime cputime_expires;
    - u64 expiries[CPUCLOCK_MAX];
    - };
    - struct list_head cpu_timers[CPUCLOCK_MAX];
    + u64 expiries[CPUCLOCK_MAX];
    + struct list_head cpu_timers[CPUCLOCK_MAX];
    };

    static inline void posix_cputimers_init(struct posix_cputimers *pct)
    diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
    index e159b03..ffd4918 100644
    --- a/kernel/time/posix-cpu-timers.c
    +++ b/kernel/time/posix-cpu-timers.c
    @@ -18,16 +18,6 @@

    #include "posix-timers.h"

    -static inline void temporary_check(void)
    -{
    - BUILD_BUG_ON(offsetof(struct task_cputime, stime) !=
    - CPUCLOCK_PROF * sizeof(u64));
    - BUILD_BUG_ON(offsetof(struct task_cputime, utime) !=
    - CPUCLOCK_VIRT * sizeof(u64));
    - BUILD_BUG_ON(offsetof(struct task_cputime, sum_exec_runtime) !=
    - CPUCLOCK_SCHED * sizeof(u64));
    -}
    -
    static void posix_cpu_timer_rearm(struct k_itimer *timer);

    void posix_cputimers_group_init(struct posix_cputimers *pct, u64 cpu_limit)
    \
     
     \ /
      Last update: 2019-08-28 12:18    [W:3.851 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site