lkml.org 
[lkml]   [2019]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch V2 27/38] 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>
---
include/linux/posix-timers.h | 9 ++-------
kernel/time/posix-cpu-timers.c | 10 ----------
2 files changed, 2 insertions(+), 17 deletions(-)

--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -65,19 +65,14 @@ static inline int clockid_to_fd(const cl
#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)
--- 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-21 21:32    [W:0.669 / U:6.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site