Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...

[linux-2.6] / kernel / compat.c

diff --git a/kernel/compat.c b/kernel/compat.c
index f2a2975042871ee8607803bd5eca47acdbda005f..5f0e201bcfd3b883418b16f04c32da51cf2353be 100644 (file)
--- 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))