diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index e7548dee636b..2b44d82b8237 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1103,7 +1103,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
| 1103 | 1103 | ||
| 1104 | posix_cpu_timers_init(p); | 1104 | posix_cpu_timers_init(p); |
| 1105 | 1105 | ||
| 1106 | p->lock_depth = -1; /* -1 = no lock */ | ||
| 1107 | do_posix_clock_monotonic_gettime(&p->start_time); | 1106 | do_posix_clock_monotonic_gettime(&p->start_time); |
| 1108 | p->real_start_time = p->start_time; | 1107 | p->real_start_time = p->start_time; |
| 1109 | monotonic_to_bootbased(&p->real_start_time); | 1108 | monotonic_to_bootbased(&p->real_start_time); |
| @@ -1153,7 +1152,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
| 1153 | #endif | 1152 | #endif |
| 1154 | 1153 | ||
| 1155 | /* Perform scheduler related setup. Assign this task to a CPU. */ | 1154 | /* Perform scheduler related setup. Assign this task to a CPU. */ |
| 1156 | sched_fork(p, clone_flags); | 1155 | sched_fork(p); |
| 1157 | 1156 | ||
| 1158 | retval = perf_event_init_task(p); | 1157 | retval = perf_event_init_task(p); |
| 1159 | if (retval) | 1158 | if (retval) |
| @@ -1464,7 +1463,7 @@ long do_fork(unsigned long clone_flags, | |||
| 1464 | */ | 1463 | */ |
| 1465 | p->flags &= ~PF_STARTING; | 1464 | p->flags &= ~PF_STARTING; |
| 1466 | 1465 | ||
| 1467 | wake_up_new_task(p, clone_flags); | 1466 | wake_up_new_task(p); |
| 1468 | 1467 | ||
| 1469 | tracehook_report_clone_complete(trace, regs, | 1468 | tracehook_report_clone_complete(trace, regs, |
| 1470 | clone_flags, nr, p); | 1469 | clone_flags, nr, p); |
