diff options
-rw-r--r-- | kernel/compat.c | 1 | ||||
-rw-r--r-- | kernel/hrtimer.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index f2a297504287..5f0e201bcfd3 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
@@ -55,7 +55,6 @@ static long compat_nanosleep_restart(struct restart_block *restart) | |||
55 | set_fs(oldfs); | 55 | set_fs(oldfs); |
56 | 56 | ||
57 | if (ret) { | 57 | if (ret) { |
58 | restart->fn = compat_nanosleep_restart; | ||
59 | restart->arg1 = (unsigned long)rmtp; | 58 | restart->arg1 = (unsigned long)rmtp; |
60 | 59 | ||
61 | if (rmtp && put_compat_timespec(&rmt, rmtp)) | 60 | if (rmtp && put_compat_timespec(&rmt, rmtp)) |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 355085f0896e..3f4a57c7895d 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1340,8 +1340,6 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart) | |||
1340 | struct hrtimer_sleeper t; | 1340 | struct hrtimer_sleeper t; |
1341 | struct timespec __user *rmtp; | 1341 | struct timespec __user *rmtp; |
1342 | 1342 | ||
1343 | restart->fn = do_no_restart_syscall; | ||
1344 | |||
1345 | hrtimer_init(&t.timer, restart->arg0, HRTIMER_MODE_ABS); | 1343 | hrtimer_init(&t.timer, restart->arg0, HRTIMER_MODE_ABS); |
1346 | t.timer.expires.tv64 = ((u64)restart->arg3 << 32) | (u64) restart->arg2; | 1344 | t.timer.expires.tv64 = ((u64)restart->arg3 << 32) | (u64) restart->arg2; |
1347 | 1345 | ||
@@ -1355,8 +1353,6 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart) | |||
1355 | return ret; | 1353 | return ret; |
1356 | } | 1354 | } |
1357 | 1355 | ||
1358 | restart->fn = hrtimer_nanosleep_restart; | ||
1359 | |||
1360 | /* The other values in restart are already filled in */ | 1356 | /* The other values in restart are already filled in */ |
1361 | return -ERESTART_RESTARTBLOCK; | 1357 | return -ERESTART_RESTARTBLOCK; |
1362 | } | 1358 | } |