summaryrefslogtreecommitdiffstats
path: root/kernel/compat.c
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2017-06-07 09:42:28 +0100
committerThomas Gleixner <tglx@linutronix.de>2017-06-14 00:00:40 +0200
commit192a82f9003fe8fabd6088aa646e829225a94c55 (patch)
tree86c755bd9c5ef78d53006bc75170030b092297a8 /kernel/compat.c
parent15f27ce24cb613e6e01ce27c4094c55e55dde5d4 (diff)
downloadlinux-192a82f9003fe8fabd6088aa646e829225a94c55.tar.gz
linux-192a82f9003fe8fabd6088aa646e829225a94c55.tar.bz2
linux-192a82f9003fe8fabd6088aa646e829225a94c55.zip
hrtimer_nanosleep(): Pass rmtp in restart_block
Store the pointer to the timespec which gets updated with the remaining time in the restart block and remove the function argument. [ tglx: Added changelog ] 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-3-viro@ZenIV.linux.org.uk
Diffstat (limited to 'kernel/compat.c')
-rw-r--r--kernel/compat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/compat.c b/kernel/compat.c
index 933bcb31ae10..cc9ba9d29b47 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -253,9 +253,9 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
oldfs = get_fs();
set_fs(KERNEL_DS);
- ret = hrtimer_nanosleep(&tu64,
- rmtp ? (struct timespec __user *)&rmt : NULL,
- HRTIMER_MODE_REL, CLOCK_MONOTONIC);
+ current->restart_block.nanosleep.rmtp =
+ rmtp ? (struct timespec __user *)&rmt : NULL;
+ ret = hrtimer_nanosleep(&tu64, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
set_fs(oldfs);
/*