The following commit has been merged into the timers/core branch of tip: Commit-ID: bbc9bae1e49bee9862c7f24101a728e73cd9f589 Gitweb: https://git.kernel.org/tip/bbc9bae1e49bee9862c7f24101a728e73cd9f589 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Wed, 21 Aug 2019 21:09:11 +02:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 28 Aug 2019 11:50:37 +02:00 posix-cpu-timers: Remove the odd field rename defines The last users of the odd define based renaming of struct task_cputime members are gone. Good riddance. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Frederic Weisbecker <frederic@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20190821192921.499058279@xxxxxxxxxxxxx --- include/linux/posix-timers.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index ed0f6ec..e36c6fd 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -62,21 +62,6 @@ static inline int clockid_to_fd(const clockid_t clk) return ~(clk >> 3); } -/* - * Alternate field names for struct task_cputime when used on cache - * expirations. Will go away soon. - * - * stime corresponds to CLOCKCPU_PROF - * utime corresponds to CLOCKCPU_VIRT - * sum_exex_runtime corresponds to CLOCKCPU_SCHED - * - * The ordering is currently enforced so struct task_cputime and the - * expiries array in struct posix_cputimers are equivalent. - */ -#define prof_exp stime -#define virt_exp utime -#define sched_exp sum_exec_runtime - #ifdef CONFIG_POSIX_TIMERS /** * posix_cputimers - Container for posix CPU timer related data
|