aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/fork.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 03c1eaaa6ef5..0bb88b555550 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1091,10 +1091,7 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
1091{ 1091{
1092 unsigned long cpu_limit; 1092 unsigned long cpu_limit;
1093 1093
1094 /* Thread group counters. */ 1094 cpu_limit = READ_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur);
1095 thread_group_cputime_init(sig);
1096
1097 cpu_limit = ACCESS_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur);
1098 if (cpu_limit != RLIM_INFINITY) { 1095 if (cpu_limit != RLIM_INFINITY) {
1099 sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit); 1096 sig->cputime_expires.prof_exp = secs_to_cputime(cpu_limit);
1100 sig->cputimer.running = 1; 1097 sig->cputimer.running = 1;
@@ -1396,6 +1393,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
1396 p->hardirq_context = 0; 1393 p->hardirq_context = 0;
1397 p->softirq_context = 0; 1394 p->softirq_context = 0;
1398#endif 1395#endif
1396
1397 p->pagefault_disabled = 0;
1398
1399#ifdef CONFIG_LOCKDEP 1399#ifdef CONFIG_LOCKDEP
1400 p->lockdep_depth = 0; /* no locks held yet */ 1400 p->lockdep_depth = 0; /* no locks held yet */
1401 p->curr_chain_key = 0; 1401 p->curr_chain_key = 0;