From: Roland McGrath <roland@redhat.com>
Thanks for finding that.
Ack! I did a quick merge of my well-tested patches with the cputime_t
stuff, and apparently didn't do quite as much testing as I thought I did.
There was a little query/replace error in my per-process-itimer-cpu patch
now in -mm. Your patch is necessary but not sufficient. This patch fixes
all the errors.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/kernel/itimer.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN kernel/itimer.c~make-itimer_prof-itimer_virtual-per-process-fix kernel/itimer.c
--- 25/kernel/itimer.c~make-itimer_prof-itimer_virtual-per-process-fix Thu Feb 24 17:43:12 2005
+++ 25-akpm/kernel/itimer.c Thu Feb 24 17:43:12 2005
@@ -56,9 +56,9 @@ int do_getitimer(int which, struct itime
t = next_thread(t);
} while (t != tsk);
if (cputime_le(cval, utime)) { /* about to fire */
- val = jiffies_to_cputime(1);
+ cval = jiffies_to_cputime(1);
} else {
- val = cputime_sub(val, utime);
+ cval = cputime_sub(cval, utime);
}
}
spin_unlock_irq(&tsk->sighand->siglock);
@@ -82,9 +82,9 @@ int do_getitimer(int which, struct itime
t = next_thread(t);
} while (t != tsk);
if (cputime_le(cval, ptime)) { /* about to fire */
- val = jiffies_to_cputime(1);
+ cval = jiffies_to_cputime(1);
} else {
- val = cputime_sub(val, ptime);
+ cval = cputime_sub(cval, ptime);
}
}
spin_unlock_irq(&tsk->sighand->siglock);
_