diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-02-01 12:41:30 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-10 04:48:03 -0500 |
commit | c289b074b66e2e59c65aba73f40b99e797e92d2f (patch) | |
tree | 03ecf2381f33941e8d84e1d5b2d8e106109ea7da /kernel/compat.c | |
parent | 416529374b4793ba2d2e97e736d108a2e0f3ef07 (diff) |
hrtimer: don't modify restart_block->fn in restart functions
hrtimer_nanosleep_restart() clears/restores restart_block->fn. This is
pointless and complicates its usage. Note that if sys_restart_syscall()
doesn't actually happen, we have a bogus "pending" restart->fn anyway,
this is harmless.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Pavel Emelyanov <xemul@sw.ru>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Toyo Abe <toyoa@mvista.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/compat.c')
-rw-r--r-- | kernel/compat.c | 1 |
1 files changed, 0 insertions, 1 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)) |