lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] hrtimers: pass current time to hrtimer_forward()

Browse Source 
Pass current time to hrtimer_forward().  This allows to use the softirq time
in the timer base when the forward function is called from the timer callback.
 Other places pass current time with a call to timer->base->get_time().

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>
This commit is contained in:
Roman Zippel
2006-03-26 01:38:06 -08:00
committed by Linus Torvalds
parent 92127c7a45
commit 44f2147551
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/posix-timers.c
View File

@@ -251,15 +251,18 @@ __initcall(init_posix_timers);
static void schedule_next_timer(struct k_itimer *timr)
{
struct hrtimer *timer = &timr->it.real.timer;
if (timr->it.real.interval.tv64 == 0)
return;
timr->it_overrun += hrtimer_forward(&timr->it.real.timer,
timr->it_overrun += hrtimer_forward(timer, timer->base->get_time(),
timr->it.real.interval);
timr->it_overrun_last = timr->it_overrun;
timr->it_overrun = -1;
++timr->it_requeue_pending;
hrtimer_restart(&timr->it.real.timer);
hrtimer_restart(timer);
}
/*
@@ -334,6 +337,7 @@ EXPORT_SYMBOL_GPL(posix_timer_event);
static int posix_timer_fn(void *data)
{
struct k_itimer *timr = data;
struct hrtimer *timer = &timr->it.real.timer;
unsigned long flags;
int si_private = 0;
int ret = HRTIMER_NORESTART;
@@ -351,7 +355,8 @@ static int posix_timer_fn(void *data)
*/
if (timr->it.real.interval.tv64 != 0) {
timr->it_overrun +=
hrtimer_forward(&timr->it.real.timer,
hrtimer_forward(timer,
timer->base->softirq_time,
timr->it.real.interval);
ret = HRTIMER_RESTART;
++timr->it_requeue_pending;
@@ -623,7 +628,8 @@ common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting)
if (timr->it_requeue_pending & REQUEUE_PENDING ||
(timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE) {
timr->it_overrun +=
hrtimer_forward(timer, timr->it.real.interval);
hrtimer_forward(timer, timer->base->get_time(),
timr->it.real.interval);
remaining = hrtimer_get_remaining(timer);
}
calci: