Patched in Tegra support.

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index 61fb2e9e903..a0d042aa296 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/arch/xtensa/kernel/ptrace.c
@@ -24,6 +24,7 @@
 
 #include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
 #include <asm/elf.h>
@@ -154,7 +155,7 @@ int ptrace_setxregs(struct task_struct *child, void __user *uregs)
         coprocessor_flush_all(ti);
         coprocessor_release_all(ti);
 
-        ret |= __copy_from_user(&ti->xtregs_cp, &xtregs->cp0,
+        ret |= __copy_from_user(&ti->xtregs_cp, &xtregs->cp0, 
                                 sizeof(xtregs_coprocessor_t));
 #endif
         ret |= __copy_from_user(&regs->xtregs_opt, &xtregs->opt,
@@ -333,7 +334,8 @@ void do_syscall_trace_enter(struct pt_regs *regs)
                 do_syscall_trace();
 
 #if 0
-        audit_syscall_entry(current, AUDIT_ARCH_XTENSA..);
+        if (unlikely(current->audit_context))
+                audit_syscall_entry(current, AUDIT_ARCH_XTENSA..);
 #endif
 }
 
@@ -343,3 +345,4 @@ void do_syscall_trace_leave(struct pt_regs *regs)
                         && (current->ptrace & PT_PTRACED))
                 do_syscall_trace();
 }
+