diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 17:06:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 17:06:19 -0400 |
| commit | db8185360d91c01f6e482db5ee402c0ad90dec52 (patch) | |
| tree | 5195407be8483cd9ae206a7877d60ebb886112bd /kernel/fork.c | |
| parent | 6a22c57b8d2a62dea7280a6b2ac807a539ef0716 (diff) | |
| parent | 38605cae99d386332df6822a22dba7bfdc8fae1c (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: fix style in kernel/sched.c
sched: fix style of swap() macro in kernel/sched_fair.c
sched: report CPU usage in CFS cgroup directories
sched: move rcu_head to task_group struct
sched: fix incorrect assumption that cpu 0 exists
sched: keep utime/stime monotonic
sched: make kernel/sched.c:account_guest_time() static
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ddafdfac9456..a65bfc47177c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1056,6 +1056,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
| 1056 | p->gtime = cputime_zero; | 1056 | p->gtime = cputime_zero; |
| 1057 | p->utimescaled = cputime_zero; | 1057 | p->utimescaled = cputime_zero; |
| 1058 | p->stimescaled = cputime_zero; | 1058 | p->stimescaled = cputime_zero; |
| 1059 | p->prev_utime = cputime_zero; | ||
| 1059 | 1060 | ||
| 1060 | #ifdef CONFIG_TASK_XACCT | 1061 | #ifdef CONFIG_TASK_XACCT |
| 1061 | p->rchar = 0; /* I/O counter: bytes read */ | 1062 | p->rchar = 0; /* I/O counter: bytes read */ |
