From: Roman Zippel Date: Fri, 17 Mar 2006 07:04:01 +0000 (-0800) Subject: [PATCH] posix-timers: fix requeue accounting when signal is ignored X-Git-Tag: v2.6.16~16 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a0c28c1a7109d7955815074c52cac079ab3ba5;p=linux-2.6 [PATCH] posix-timers: fix requeue accounting when signal is ignored When the posix-timer signal is ignored then the timer is rearmed by the callback function. The requeue pending accounting has to be fixed up else the state might be wrong. Signed-off-by: Roman Zippel Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 216f574b5f..fa895fc2ec 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -353,6 +353,7 @@ static int posix_timer_fn(void *data) hrtimer_forward(&timr->it.real.timer, timr->it.real.interval); ret = HRTIMER_RESTART; + ++timr->it_requeue_pending; } }