From c289b074b66e2e59c65aba73f40b99e797e92d2f Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 1 Feb 2008 20:41:30 +0300
Subject: 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>
---
 kernel/compat.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'kernel/compat.c')

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)
 	set_fs(oldfs);
 
 	if (ret) {
-		restart->fn = compat_nanosleep_restart;
 		restart->arg1 = (unsigned long)rmtp;
 
 		if (rmtp && put_compat_timespec(&rmt, rmtp))
-- 
cgit v1.2.3