projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
arch
/
xtensa
/
kernel
/
ptrace.c
diff --git
a/arch/xtensa/kernel/ptrace.c
b/arch/xtensa/kernel/ptrace.c
index
4cc8528
..
9aea23c
100644
(file)
--- a/
arch/xtensa/kernel/ptrace.c
+++ b/
arch/xtensa/kernel/ptrace.c
@@
-13,7
+13,6
@@
* Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca>
*/
* Marc Gauthier<marc@tensilica.com> <marc@alumni.uwaterloo.ca>
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/mm.h>
@@
-213,7
+212,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
*/
case PTRACE_KILL:
ret = 0;
*/
case PTRACE_KILL:
ret = 0;
- if (child->
state == EXIT_ZOMBIE)
/* already dead */
+ if (child->
exit_state == EXIT_ZOMBIE)
/* already dead */
break;
child->exit_code = SIGKILL;
child->ptrace &= ~PT_SINGLESTEP;
break;
child->exit_code = SIGKILL;
child->ptrace &= ~PT_SINGLESTEP;