From: Andrew Morton Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- kernel/posix-timers.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/posix-timers.c~hrtimers-set-correct-initial-expiry-time-for-relative-fix kernel/posix-timers.c --- devel/kernel/posix-timers.c~hrtimers-set-correct-initial-expiry-time-for-relative-fix 2006-01-19 21:08:44.000000000 -0800 +++ devel-akpm/kernel/posix-timers.c 2006-01-19 21:08:44.000000000 -0800 @@ -727,7 +727,7 @@ common_timer_set(struct k_itimer *timr, if (((timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE)) { /* Setup correct expiry time for relative timers */ if (mode == HRTIMER_REL) - timer->expires = ktime_add(timer-expires, + timer->expires = ktime_add(timer->expires, timer->base->get_time()); return 0; } _