aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-03-16 23:04:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-17 07:51:25 -0800
commita0a0c28c1a7109d7955815074c52cac079ab3ba5 (patch)
tree7b2497a9836f1a3c964cb02b8067af3053524c10
parent67890d7084085e29c51afa2514036d42643fd3cf (diff)
downloadkernel_samsung_espresso10-a0a0c28c1a7109d7955815074c52cac079ab3ba5.zip
kernel_samsung_espresso10-a0a0c28c1a7109d7955815074c52cac079ab3ba5.tar.gz
kernel_samsung_espresso10-a0a0c28c1a7109d7955815074c52cac079ab3ba5.tar.bz2
[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 <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>
-rw-r--r--kernel/posix-timers.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 216f574..fa895fc 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;
}
}