2008-08-22 15:21:46

by Adrian Bunk

Subject: [2.6 patch] sh: fix ptrace_64.c:user_disable_single_step()

This patch fixes the following compile error caused by
commit c459dbf294b4a3d70490a468a7ca3907fb2c2f57
(sh: ptrace single stepping cleanups.):

<-- snip -->

...
CC arch/sh/kernel/ptrace_64.o
arch/sh/kernel/ptrace_64.c: In function 'user_disable_single_step':
arch/sh/kernel/ptrace_64.c:134: error: 'regs' undeclared (first use in this function)
arch/sh/kernel/ptrace_64.c:134: error: (Each undeclared identifier is reported only once
arch/sh/kernel/ptrace_64.c:134: error: for each function it appears in.)
...
make[2]: *** [arch/sh/kernel/ptrace_64.o] Error 1

<-- snip -->

Reported-by: Adrian Bunk <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

---
956a62dc8d102633bdeb955f639d179b066703a5
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index 5922edd..9c64248 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -131,6 +131,8 @@ void user_enable_single_step(struct task_struct *child)

void user_disable_single_step(struct task_struct *child)
{
+ struct pt_regs *regs = child->thread.uregs;
+
regs->sr &= ~SR_SSTEP;
}

2008-08-25 06:28:18

by Paul Mundt

Subject: Re: [2.6 patch] sh: fix ptrace_64.c:user_disable_single_step()

On Fri, Aug 22, 2008 at 06:20:36PM +0300, Adrian Bunk wrote:
> This patch fixes the following compile error caused by
> commit c459dbf294b4a3d70490a468a7ca3907fb2c2f57
> (sh: ptrace single stepping cleanups.):
>
> <-- snip -->
>
> ...
> CC arch/sh/kernel/ptrace_64.o
> arch/sh/kernel/ptrace_64.c: In function 'user_disable_single_step':
> arch/sh/kernel/ptrace_64.c:134: error: 'regs' undeclared (first use in this function)
> arch/sh/kernel/ptrace_64.c:134: error: (Each undeclared identifier is reported only once
> arch/sh/kernel/ptrace_64.c:134: error: for each function it appears in.)
> ...
> make[2]: *** [arch/sh/kernel/ptrace_64.o] Error 1
>
> <-- snip -->
>
> Reported-by: Adrian Bunk <[email protected]>
> Signed-off-by: Adrian Bunk <[email protected]>
>
Applied, thanks.