From 5e7b324314500e699e76f9e6ef9b537c4538800e Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 7 Feb 2011 11:38:57 +0100 Subject: [PATCH] --- yaml --- r: 235194 b: refs/heads/master c: c1df53b33c818d28d5e3b287530373e78a7904e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/microblaze/include/asm/syscall.h | 3 +++ trunk/arch/microblaze/kernel/ptrace.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82e3cee34cb1..8922b4ed48e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f699980b0d3c0f4f31e07ef45a48bbe860510a89 +refs/heads/master: c1df53b33c818d28d5e3b287530373e78a7904e7 diff --git a/trunk/arch/microblaze/include/asm/syscall.h b/trunk/arch/microblaze/include/asm/syscall.h index 048dfcd8d89d..9bc431783105 100644 --- a/trunk/arch/microblaze/include/asm/syscall.h +++ b/trunk/arch/microblaze/include/asm/syscall.h @@ -96,4 +96,7 @@ static inline void syscall_set_arguments(struct task_struct *task, microblaze_set_syscall_arg(regs, i++, *args++); } +asmlinkage long do_syscall_trace_enter(struct pt_regs *regs); +asmlinkage void do_syscall_trace_leave(struct pt_regs *regs); + #endif /* __ASM_MICROBLAZE_SYSCALL_H */ diff --git a/trunk/arch/microblaze/kernel/ptrace.c b/trunk/arch/microblaze/kernel/ptrace.c index 05ac8cc975d5..6a8e0cc5c57d 100644 --- a/trunk/arch/microblaze/kernel/ptrace.c +++ b/trunk/arch/microblaze/kernel/ptrace.c @@ -39,6 +39,7 @@ #include #include #include +#include #include /* Returns the address where the register at REG_OFFS in P is stashed away. */ @@ -123,7 +124,7 @@ long arch_ptrace(struct task_struct *child, long request, rval = -EIO; if (rval == 0 && request == PTRACE_PEEKUSR) - rval = put_user(val, (unsigned long *)data); + rval = put_user(val, (unsigned long __user *)data); break; default: rval = ptrace_request(child, request, addr, data);