diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /arch/xtensa/kernel/ptrace.c | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/xtensa/kernel/ptrace.c')
| -rw-r--r-- | arch/xtensa/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c index 5064d9383963..9aea23cc0dc5 100644 --- a/arch/xtensa/kernel/ptrace.c +++ b/arch/xtensa/kernel/ptrace.c | |||
| @@ -212,7 +212,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
| 212 | */ | 212 | */ |
| 213 | case PTRACE_KILL: | 213 | case PTRACE_KILL: |
| 214 | ret = 0; | 214 | ret = 0; |
| 215 | if (child->state == EXIT_ZOMBIE) /* already dead */ | 215 | if (child->exit_state == EXIT_ZOMBIE) /* already dead */ |
| 216 | break; | 216 | break; |
| 217 | child->exit_code = SIGKILL; | 217 | child->exit_code = SIGKILL; |
| 218 | child->ptrace &= ~PT_SINGLESTEP; | 218 | child->ptrace &= ~PT_SINGLESTEP; |