diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 10:58:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 10:58:22 -0800 |
commit | 9bfb52ad716e74785b2402b7ea17f30e0344b8e8 (patch) | |
tree | a7800b58aab409632940a11b27db19c268064cab /kernel/sched_debug.c | |
parent | c46f739dd39db3b07ab5deb4e3ec81e1c04a91af (diff) | |
parent | f95e0d1c2ad668c77aa4b272c076faf3aa0d631c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: clean up kernel/sched_stat.h
sched: clean up overlong line in kernel/sched_debug.c
sched: clean up, move __sched_text_start/end to sched.h
sched: clean up sd_alloc_ctl_cpu_table() definition
softlockup: fix false positives on CONFIG_NOHZ
Diffstat (limited to 'kernel/sched_debug.c')
-rw-r--r-- | kernel/sched_debug.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 5d0d623a546..d30467b47dd 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -327,10 +327,12 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) avg_atom = -1LL; avg_per_cpu = p->se.sum_exec_runtime; - if (p->se.nr_migrations) - avg_per_cpu = div64_64(avg_per_cpu, p->se.nr_migrations); - else + if (p->se.nr_migrations) { + avg_per_cpu = div64_64(avg_per_cpu, + p->se.nr_migrations); + } else { avg_per_cpu = -1LL; + } __PN(avg_atom); __PN(avg_per_cpu); |