aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-22 18:45:01 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-22 18:45:01 +0200
commit90edf27fb89241917e91155bfdcc7c8e5a587222 (patch)
treea2d1841cfe382f426a3b6ccb306b0665ad455885 /kernel/sched.c
parent41945f6ccf1e86f87fddf6b32db9cf431c05fb54 (diff)
parent8b15575cae7a93a784c3005c42b069edd9ba64dd (diff)
downloadmrst-s0i3-test-90edf27fb89241917e91155bfdcc7c8e5a587222.tar.gz
mrst-s0i3-test-90edf27fb89241917e91155bfdcc7c8e5a587222.tar.xz
mrst-s0i3-test-90edf27fb89241917e91155bfdcc7c8e5a587222.zip
Merge branch 'linus' into perf/core
Conflicts: kernel/hw_breakpoint.c Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 794819eab9c..c0d2067f3e0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3513,9 +3513,9 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
rtime = nsecs_to_cputime(p->se.sum_exec_runtime);
if (total) {
- u64 temp;
+ u64 temp = rtime;
- temp = (u64)(rtime * utime);
+ temp *= utime;
do_div(temp, total);
utime = (cputime_t)temp;
} else
@@ -3546,9 +3546,9 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
rtime = nsecs_to_cputime(cputime.sum_exec_runtime);
if (total) {
- u64 temp;
+ u64 temp = rtime;
- temp = (u64)(rtime * cputime.utime);
+ temp *= cputime.utime;
do_div(temp, total);
utime = (cputime_t)temp;
} else