git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[pandora-kernel.git]
/
fs
/
proc
/
array.c
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index
7a34571
..
63c95af
100644
(file)
--- a/
fs/proc/array.c
+++ b/
fs/proc/array.c
@@
-456,7
+456,7
@@
static int do_task_stat(struct task_struct *task, char *buffer, int whole)
maj_flt += sig->maj_flt;
utime = cputime_add(utime, sig->utime);
stime = cputime_add(stime, sig->stime);
- gtime
+
= cputime_add(gtime, sig->gtime);
+ gtime = cputime_add(gtime, sig->gtime);
}
sid = task_session_nr_ns(task, ns);