summaryrefslogtreecommitdiffstats
path: root/kernel/time/alarmtimer.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-06-07 09:42:32 +0100
committerThomas Gleixner <tglx@linutronix.de>2017-06-14 00:00:42 +0200
commitce41aaf47af3d28c4c958e07675a3e0a51f09bd3 (patch)
tree8bab8f8c31352e11bab4e80a1c0d302a352c7361 /kernel/time/alarmtimer.c
parentedbeda46322fbcb15af2d2d0f2daffb0cd349a5a (diff)
downloadblackbird-op-linux-ce41aaf47af3d28c4c958e07675a3e0a51f09bd3.tar.gz
blackbird-op-linux-ce41aaf47af3d28c4c958e07675a3e0a51f09bd3.zip
hrtimers/posix-timers: Merge nanosleep timespec copyout logics into a new helper
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20170607084241.28657-7-viro@ZenIV.linux.org.uk
Diffstat (limited to 'kernel/time/alarmtimer.c')
-rw-r--r--kernel/time/alarmtimer.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 57bcf94ee132..7bed4e44f9bd 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -721,15 +721,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,
return 0;
rmt = ktime_to_timespec(rem);
-#ifdef CONFIG_COMPAT
- if (restart->nanosleep.type == TT_COMPAT) {
- if (compat_put_timespec(&rmt,
- restart->nanosleep.compat_rmtp))
- return -EFAULT;
- } else
-#endif
- if (copy_to_user(restart->nanosleep.rmtp, &rmt, sizeof(rmt)))
- return -EFAULT;
+ return nanosleep_copyout(restart, &rmt);
}
return -ERESTART_RESTARTBLOCK;
}
OpenPOWER on IntegriCloud