diff options
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 166b8c49257c..3d6f121bbe8a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -884,6 +884,9 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) | |||
884 | sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero; | 884 | sig->utime = sig->stime = sig->cutime = sig->cstime = cputime_zero; |
885 | sig->gtime = cputime_zero; | 885 | sig->gtime = cputime_zero; |
886 | sig->cgtime = cputime_zero; | 886 | sig->cgtime = cputime_zero; |
887 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING | ||
888 | sig->prev_utime = sig->prev_stime = cputime_zero; | ||
889 | #endif | ||
887 | sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0; | 890 | sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0; |
888 | sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0; | 891 | sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt = 0; |
889 | sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0; | 892 | sig->inblock = sig->oublock = sig->cinblock = sig->coublock = 0; |
@@ -1066,8 +1069,10 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1066 | p->gtime = cputime_zero; | 1069 | p->gtime = cputime_zero; |
1067 | p->utimescaled = cputime_zero; | 1070 | p->utimescaled = cputime_zero; |
1068 | p->stimescaled = cputime_zero; | 1071 | p->stimescaled = cputime_zero; |
1072 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING | ||
1069 | p->prev_utime = cputime_zero; | 1073 | p->prev_utime = cputime_zero; |
1070 | p->prev_stime = cputime_zero; | 1074 | p->prev_stime = cputime_zero; |
1075 | #endif | ||
1071 | 1076 | ||
1072 | p->default_timer_slack_ns = current->timer_slack_ns; | 1077 | p->default_timer_slack_ns = current->timer_slack_ns; |
1073 | 1078 | ||