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

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index e36c6fda1af9f7f85f45ede9354baa15a2ca0d43..fd9098467d6de3386708fa660aff3bffb0fece86 100644 (file)
--- 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 e159b039e44afee3d5033c4dfb80ab0d8a529765..ffd49181e23d31c6254e16e0fff8783e2b3a0d34 100644 (file)
--- 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)