[hurd] 67/75: Fix pfinet crash

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch dde
in repository hurd.

commit 1a7e27057ed5974be103c60afecdc8aae691584f
Author: Samuel Thibault <address@hidden>
Date:   Sun Jan 3 13:34:42 2016 +0100

    Fix pfinet crash
    
    During rsyslog testsuite, it does happen that threads running
    schedule_timeout get woken up by something else than the timer.  The (local)
    timer needs to be removed in that case.  Let's just always remove it, like
    Linux does.
    
    * pfinet/glue-include/linux/sched.h (schedule_timeout): Remove local timer
    before returning.
---
 pfinet/glue-include/linux/sched.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pfinet/glue-include/linux/sched.h 
b/pfinet/glue-include/linux/sched.h
index 5cf2f1b..e39263e 100644
--- a/pfinet/glue-include/linux/sched.h
+++ b/pfinet/glue-include/linux/sched.h
@@ -185,6 +185,9 @@ schedule_timeout (long timeout)
       else
        return 0;
     }
+  /* It may happen that we get woken without a signal. Noticed notably during
+     rsyslog testsuite.  Make sure we don't leave our timer in.  */
+  del_timer(&timer);
   return 0;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git