The following commit has been merged into the timers/core branch of tip:
Commit-ID: ab693c5a5e3107f035d5162e6ada9aaf7dd76a1d
Gitweb: https://git.kernel.org/tip/ab693c5a5e3107f035d5162e6ada9aaf7dd76a1d
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Wed, 21 Aug 2019 21:09:03 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Wed, 28 Aug 2019 11:50:33 +02:00
posix-cpu-timers: Move prof/virt_ticks into caller
The functions have only one caller left. No point in having them.
Move the almost duplicated code into the caller and simplify it.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Frederic Weisbecker <frederic@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/20190821192920.729298382@xxxxxxxxxxxxx
---
kernel/time/posix-cpu-timers.c | 30 +++++++++---------------------
1 file changed, 9 insertions(+), 21 deletions(-)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 98dab3e..b1c9766 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -130,23 +130,6 @@ static inline int task_cputime_zero(const struct task_cputime *cputime)
return 0;
}
-static inline u64 prof_ticks(struct task_struct *p)
-{
- u64 utime, stime;
-
- task_cputime(p, &utime, &stime);
-
- return utime + stime;
-}
-static inline u64 virt_ticks(struct task_struct *p)
-{
- u64 utime, stime;
-
- task_cputime(p, &utime, &stime);
-
- return utime;
-}
-
static int
posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp)
{
@@ -184,13 +167,18 @@ posix_cpu_clock_set(const clockid_t clock, const struct timespec64 *tp)
*/
static u64 cpu_clock_sample(const clockid_t clkid, struct task_struct *p)
{
+ u64 utime, stime;
+
+ if (clkid == CPUCLOCK_SCHED)
+ return task_sched_runtime(p);
+
+ task_cputime(p, &utime, &stime);
+
switch (clkid) {
case CPUCLOCK_PROF:
- return prof_ticks(p);
+ return utime + stime;
case CPUCLOCK_VIRT:
- return virt_ticks(p);
- case CPUCLOCK_SCHED:
- return task_sched_runtime(p);
+ return utime;
default:
WARN_ON_ONCE(1);
}
|