diff options
Diffstat (limited to 'kernel/itimer.c')
| -rw-r--r-- | kernel/itimer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index b03451ede528..d802883153da 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c | |||
| @@ -146,6 +146,7 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id, | |||
| 146 | { | 146 | { |
| 147 | cputime_t cval, nval, cinterval, ninterval; | 147 | cputime_t cval, nval, cinterval, ninterval; |
| 148 | s64 ns_ninterval, ns_nval; | 148 | s64 ns_ninterval, ns_nval; |
| 149 | u32 error, incr_error; | ||
| 149 | struct cpu_itimer *it = &tsk->signal->it[clock_id]; | 150 | struct cpu_itimer *it = &tsk->signal->it[clock_id]; |
| 150 | 151 | ||
| 151 | nval = timeval_to_cputime(&value->it_value); | 152 | nval = timeval_to_cputime(&value->it_value); |
| @@ -153,8 +154,8 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id, | |||
| 153 | ninterval = timeval_to_cputime(&value->it_interval); | 154 | ninterval = timeval_to_cputime(&value->it_interval); |
| 154 | ns_ninterval = timeval_to_ns(&value->it_interval); | 155 | ns_ninterval = timeval_to_ns(&value->it_interval); |
| 155 | 156 | ||
| 156 | it->incr_error = cputime_sub_ns(ninterval, ns_ninterval); | 157 | error = cputime_sub_ns(nval, ns_nval); |
| 157 | it->error = cputime_sub_ns(nval, ns_nval); | 158 | incr_error = cputime_sub_ns(ninterval, ns_ninterval); |
| 158 | 159 | ||
| 159 | spin_lock_irq(&tsk->sighand->siglock); | 160 | spin_lock_irq(&tsk->sighand->siglock); |
| 160 | 161 | ||
| @@ -168,6 +169,8 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id, | |||
| 168 | } | 169 | } |
| 169 | it->expires = nval; | 170 | it->expires = nval; |
| 170 | it->incr = ninterval; | 171 | it->incr = ninterval; |
| 172 | it->error = error; | ||
| 173 | it->incr_error = incr_error; | ||
| 171 | trace_itimer_state(clock_id == CPUCLOCK_VIRT ? | 174 | trace_itimer_state(clock_id == CPUCLOCK_VIRT ? |
| 172 | ITIMER_VIRTUAL : ITIMER_PROF, value, nval); | 175 | ITIMER_VIRTUAL : ITIMER_PROF, value, nval); |
| 173 | 176 | ||
