diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:48:50 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:48:50 -0500 |
commit | 29b2548bf53ffb810394a2110161ef49f8e4780f (patch) | |
tree | af0233def65a854dc95e5faca9645b30e88d45aa /kernel/posix-timers.c | |
parent | c39f5ebe0a542caab30c88e60623709c7bc6fe30 (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) |
Merge branch 'master'
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r-- | kernel/posix-timers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 216f574b5ffb..fa895fc2ecf5 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -353,6 +353,7 @@ static int posix_timer_fn(void *data) | |||
353 | hrtimer_forward(&timr->it.real.timer, | 353 | hrtimer_forward(&timr->it.real.timer, |
354 | timr->it.real.interval); | 354 | timr->it.real.interval); |
355 | ret = HRTIMER_RESTART; | 355 | ret = HRTIMER_RESTART; |
356 | ++timr->it_requeue_pending; | ||
356 | } | 357 | } |
357 | } | 358 | } |
358 | 359 | ||