diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-07-08 12:04:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-07-08 12:04:41 -0400 |
commit | 552a031ba12a4236be107a5b082a399237758a5d (patch) | |
tree | a2bcdeb651b360013dbb654bbcd61dbaf51e0331 /fs/proc/array.c | |
parent | f584dd32edc5d4400d7ceb92111a89f0c1f6651f (diff) | |
parent | 0ecfebd2b52404ae0c54a878c872bb93363ada36 (diff) |
Merge tag 'v5.2' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 2edbb657f859..55180501b915 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -462,7 +462,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
462 | * a program is not able to use ptrace(2) in that case. It is | 462 | * a program is not able to use ptrace(2) in that case. It is |
463 | * safe because the task has stopped executing permanently. | 463 | * safe because the task has stopped executing permanently. |
464 | */ | 464 | */ |
465 | if (permitted && (task->flags & PF_DUMPCORE)) { | 465 | if (permitted && (task->flags & (PF_EXITING|PF_DUMPCORE))) { |
466 | if (try_get_task_stack(task)) { | 466 | if (try_get_task_stack(task)) { |
467 | eip = KSTK_EIP(task); | 467 | eip = KSTK_EIP(task); |
468 | esp = KSTK_ESP(task); | 468 | esp = KSTK_ESP(task); |