diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-13 23:29:14 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-14 00:00:46 +0200 |
| commit | 343d8fc208e43e50525ae6e0fc4845b9966b7318 (patch) | |
| tree | 23538f3c6d280e2f67af57218b035963755f34f8 | |
| parent | 2b2d02856b3176701c91d723356f766d6ee27853 (diff) | |
| download | linux-stable-343d8fc208e43e50525ae6e0fc4845b9966b7318.tar.gz linux-stable-343d8fc208e43e50525ae6e0fc4845b9966b7318.tar.bz2 linux-stable-343d8fc208e43e50525ae6e0fc4845b9966b7318.zip | |
posix-cpu-timers: Avoid timespec conversion in do_cpu_nanosleep()
No point in converting the expiry time back and forth.
No point either to update the value in the caller supplied variable. mark
the rqtp argument const.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 515148d4eeb1..3adfa42ca24c 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -1227,10 +1227,11 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx, } static int do_cpu_nanosleep(const clockid_t which_clock, int flags, - struct timespec64 *rqtp) + const struct timespec64 *rqtp) { - struct k_itimer timer; struct itimerspec64 it; + struct k_itimer timer; + u64 expires; int error; /* @@ -1279,7 +1280,7 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, /* * We were interrupted by a signal. */ - *rqtp = ns_to_timespec64(timer.it.cpu.expires); + expires = timer.it.cpu.expires; error = posix_cpu_timer_set(&timer, 0, &zero_it, &it); if (!error) { /* @@ -1312,7 +1313,7 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, * Report back to the user the time still remaining. */ restart = ¤t->restart_block; - restart->nanosleep.expires = timespec64_to_ns(rqtp); + restart->nanosleep.expires = expires; if (restart->nanosleep.type != TT_NONE) { struct timespec ts; |