diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 16d74f13a3e7..73affd35e76d 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -128,12 +128,6 @@ static void __exit_signal(struct task_struct *tsk) | |||
128 | sig = NULL; /* Marker for below. */ | 128 | sig = NULL; /* Marker for below. */ |
129 | } | 129 | } |
130 | 130 | ||
131 | /* | ||
132 | * Flush inherited counters to the parent - before the parent | ||
133 | * gets woken up by child-exit notifications. | ||
134 | */ | ||
135 | perf_counter_exit_task(tsk); | ||
136 | |||
137 | __unhash_process(tsk); | 131 | __unhash_process(tsk); |
138 | 132 | ||
139 | /* | 133 | /* |
@@ -183,6 +177,13 @@ repeat: | |||
183 | atomic_dec(&__task_cred(p)->user->processes); | 177 | atomic_dec(&__task_cred(p)->user->processes); |
184 | 178 | ||
185 | proc_flush_task(p); | 179 | proc_flush_task(p); |
180 | |||
181 | /* | ||
182 | * Flush inherited counters to the parent - before the parent | ||
183 | * gets woken up by child-exit notifications. | ||
184 | */ | ||
185 | perf_counter_exit_task(p); | ||
186 | |||
186 | write_lock_irq(&tasklist_lock); | 187 | write_lock_irq(&tasklist_lock); |
187 | tracehook_finish_release_task(p); | 188 | tracehook_finish_release_task(p); |
188 | __exit_signal(p); | 189 | __exit_signal(p); |