diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index da4a6a10d088..b058c5820ecd 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1023,8 +1023,8 @@ void mm_init_owner(struct mm_struct *mm, struct task_struct *p) | |||
| 1023 | */ | 1023 | */ |
| 1024 | static void posix_cpu_timers_init(struct task_struct *tsk) | 1024 | static void posix_cpu_timers_init(struct task_struct *tsk) |
| 1025 | { | 1025 | { |
| 1026 | tsk->cputime_expires.prof_exp = cputime_zero; | 1026 | tsk->cputime_expires.prof_exp = 0; |
| 1027 | tsk->cputime_expires.virt_exp = cputime_zero; | 1027 | tsk->cputime_expires.virt_exp = 0; |
| 1028 | tsk->cputime_expires.sched_exp = 0; | 1028 | tsk->cputime_expires.sched_exp = 0; |
| 1029 | INIT_LIST_HEAD(&tsk->cpu_timers[0]); | 1029 | INIT_LIST_HEAD(&tsk->cpu_timers[0]); |
| 1030 | INIT_LIST_HEAD(&tsk->cpu_timers[1]); | 1030 | INIT_LIST_HEAD(&tsk->cpu_timers[1]); |
| @@ -1132,14 +1132,10 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
| 1132 | 1132 | ||
| 1133 | init_sigpending(&p->pending); | 1133 | init_sigpending(&p->pending); |
| 1134 | 1134 | ||
| 1135 | p->utime = cputime_zero; | 1135 | p->utime = p->stime = p->gtime = 0; |
| 1136 | p->stime = cputime_zero; | 1136 | p->utimescaled = p->stimescaled = 0; |
| 1137 | p->gtime = cputime_zero; | ||
| 1138 | p->utimescaled = cputime_zero; | ||
| 1139 | p->stimescaled = cputime_zero; | ||
| 1140 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING | 1137 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING |
| 1141 | p->prev_utime = cputime_zero; | 1138 | p->prev_utime = p->prev_stime = 0; |
| 1142 | p->prev_stime = cputime_zero; | ||
| 1143 | #endif | 1139 | #endif |
| 1144 | #if defined(SPLIT_RSS_COUNTING) | 1140 | #if defined(SPLIT_RSS_COUNTING) |
| 1145 | memset(&p->rss_stat, 0, sizeof(p->rss_stat)); | 1141 | memset(&p->rss_stat, 0, sizeof(p->rss_stat)); |
