From b4ed0295f0815ecd99b8d2295f2313167b98ede3 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Tue, 17 Nov 2009 14:14:12 -0800 Subject: [PATCH] --- yaml --- r: 173149 b: refs/heads/master c: 8747d793fc5c4d3e4decd41d55f6dc24498dd5f5 h: refs/heads/master i: 173147: c1818254eb882ce8d7ad0efff5249df93112878b v: v3 --- [refs] | 2 +- trunk/kernel/itimer.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6860402e9bc7..1ceace357272 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0696b711e4be45fa104c12329f617beb29c03f78 +refs/heads/master: 8747d793fc5c4d3e4decd41d55f6dc24498dd5f5 diff --git a/trunk/kernel/itimer.c b/trunk/kernel/itimer.c index b03451ede528..d802883153da 100644 --- a/trunk/kernel/itimer.c +++ b/trunk/kernel/itimer.c @@ -146,6 +146,7 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id, { cputime_t cval, nval, cinterval, ninterval; s64 ns_ninterval, ns_nval; + u32 error, incr_error; struct cpu_itimer *it = &tsk->signal->it[clock_id]; nval = timeval_to_cputime(&value->it_value); @@ -153,8 +154,8 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id, ninterval = timeval_to_cputime(&value->it_interval); ns_ninterval = timeval_to_ns(&value->it_interval); - it->incr_error = cputime_sub_ns(ninterval, ns_ninterval); - it->error = cputime_sub_ns(nval, ns_nval); + error = cputime_sub_ns(nval, ns_nval); + incr_error = cputime_sub_ns(ninterval, ns_ninterval); spin_lock_irq(&tsk->sighand->siglock); @@ -168,6 +169,8 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id, } it->expires = nval; it->incr = ninterval; + it->error = error; + it->incr_error = incr_error; trace_itimer_state(clock_id == CPUCLOCK_VIRT ? ITIMER_VIRTUAL : ITIMER_PROF, value, nval);