aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/posix-timers.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-20 11:58:09 -0500
committerSteve French <sfrench@us.ibm.com>2006-03-20 11:58:09 -0500
commitfd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch)
tree5886a08bfa1132058b06074f4666a36dc5ddd2a1 /kernel/posix-timers.c
parent88274815f7477dc7550439413ab87c5ce4c5a623 (diff)
parent7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'kernel/posix-timers.c')
-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 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