linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / kernel / ptrace.c

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index dea75d7..bcb8357 100644 (file)
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -15,6 +15,7 @@
  * this archive for more details.
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -403,6 +404,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                ret = ptrace_detach(child, data);
                break;
 
+#ifdef CONFIG_PPC64
        case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */
                int i;
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
@@ -466,6 +468,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                }
                break;
        }
+#endif /* CONFIG_PPC64 */
 
 #ifdef CONFIG_ALTIVEC
        case PTRACE_GETVRREGS:
@@ -535,7 +538,7 @@ void do_syscall_trace_enter(struct pt_regs *regs)
                do_syscall_trace();
 
        if (unlikely(current->audit_context))
-               audit_syscall_entry(
+               audit_syscall_entry(current,
 #ifdef CONFIG_PPC32
                                    AUDIT_ARCH_PPC,
 #else
@@ -553,7 +556,8 @@ void do_syscall_trace_leave(struct pt_regs *regs)
 #endif
 
        if (unlikely(current->audit_context))
-               audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+               audit_syscall_exit(current,
+                                  (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
                                   regs->result);
 
        if ((test_thread_flag(TIF_SYSCALL_TRACE)