]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] posix-timers: fix requeue accounting when signal is ignored
authorRoman Zippel <zippel@linux-m68k.org>
Fri, 17 Mar 2006 07:04:01 +0000 (23:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Mar 2006 15:51:25 +0000 (07:51 -0800)
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 <zippel@linux-m68k.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/posix-timers.c

index 216f574b5ffb758ca0630868bca07f03a3d9a116..fa895fc2ecf555daad851fceea816659fdeddf30 100644 (file)
@@ -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;
                }
        }