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
ab5c4c6
..
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>
@@
-72,7
+71,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
struct pt_regs *regs;
unsigned long tmp;
struct pt_regs *regs;
unsigned long tmp;
- regs =
xtensa
_pt_regs(child);
+ regs =
task
_pt_regs(child);
tmp = 0; /* Default return value. */
switch(addr) {
tmp = 0; /* Default return value. */
switch(addr) {
@@
-149,7
+148,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
case PTRACE_POKEUSR:
{
struct pt_regs *regs;
case PTRACE_POKEUSR:
{
struct pt_regs *regs;
- regs =
xtensa
_pt_regs(child);
+ regs =
task
_pt_regs(child);
switch (addr) {
case REG_AR_BASE ... REG_AR_BASE + XCHAL_NUM_AREGS - 1:
switch (addr) {
case REG_AR_BASE ... REG_AR_BASE + XCHAL_NUM_AREGS - 1:
@@
-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;
@@
-240,7
+239,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
* elf_gregset_t format. */
xtensa_gregset_t format;
* elf_gregset_t format. */
xtensa_gregset_t format;
- struct pt_regs *regs =
xtensa
_pt_regs(child);
+ struct pt_regs *regs =
task
_pt_regs(child);
do_copy_regs (&format, regs, child);
do_copy_regs (&format, regs, child);
@@
-257,7
+256,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
* values in the elf_gregset_t format. */
xtensa_gregset_t format;
* values in the elf_gregset_t format. */
xtensa_gregset_t format;
- struct pt_regs *regs =
xtensa
_pt_regs(child);
+ struct pt_regs *regs =
task
_pt_regs(child);
if (copy_from_user(&format,(void *)data,sizeof(elf_gregset_t))){
ret = -EFAULT;
if (copy_from_user(&format,(void *)data,sizeof(elf_gregset_t))){
ret = -EFAULT;
@@
-281,7
+280,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
* elf_fpregset_t format. */
elf_fpregset_t fpregs;
* elf_fpregset_t format. */
elf_fpregset_t fpregs;
- struct pt_regs *regs =
xtensa
_pt_regs(child);
+ struct pt_regs *regs =
task
_pt_regs(child);
do_save_fpregs (&fpregs, regs, child);
do_save_fpregs (&fpregs, regs, child);
@@
-299,7
+298,7
@@
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
* values in the elf_fpregset_t format.
*/
elf_fpregset_t fpregs;
* values in the elf_fpregset_t format.
*/
elf_fpregset_t fpregs;
- struct pt_regs *regs =
xtensa
_pt_regs(child);
+ struct pt_regs *regs =
task
_pt_regs(child);
ret = 0;
if (copy_from_user(&fpregs, (void *)data, sizeof(elf_fpregset_t))) {
ret = 0;
if (copy_from_user(&fpregs, (void *)data, sizeof(elf_fpregset_t))) {