Patchwork arm64: fix invocation of restore_altstack

login
register
mail settings
Submitter Mark Rutland
Date Feb. 14, 2013, 1:35 p.m.
Message ID <20130214133552.GB25537@e106331-lin.cambridge.arm.com>
Download mbox | patch
Permalink /patch/220444/
State New
Headers show

Comments

Mark Rutland - Feb. 14, 2013, 1:35 p.m.
Hello,

I noticed the following issue while attempting to build an arm64 kernel from
next-20130214, and it still seems to be present in signal/for-next and
signal/arch-arm64.

It looks to be a trivial typo.

Thanks,
Mark.

---->8---
Since e6d056c7c0: "arm64: switch to generic sigaltstack", arm64 won't
build:

arch/arm64/kernel/signal.c: In function ‘sys_rt_sigreturn’:
arch/arm64/kernel/signal.c:152:2: error: incompatible type for argument 1 of ‘restore_altstack’
In file included from arch/arm64/kernel/signal.c:21:0:
include/linux/signal.h:434:5: note: expected ‘const struct stack_t *’ but argument is of type ‘stack_t’
make[1]: *** [arch/arm64/kernel/signal.o] Error 1
make: *** [arch/arm64/kernel] Error 2

This patch fixes up the call to restore_altstack to pass the correct
type.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
---
 arch/arm64/kernel/signal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Al Viro - Feb. 14, 2013, 2:26 p.m.
On Thu, Feb 14, 2013 at 01:35:52PM +0000, Mark Rutland wrote:
> Hello,
> 
> I noticed the following issue while attempting to build an arm64 kernel from
> next-20130214, and it still seems to be present in signal/for-next and
> signal/arch-arm64.
> 
> It looks to be a trivial typo.

Thanks; folded and pushed.

Patch

diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index d60ad23..890a591 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -149,7 +149,7 @@  asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
 	if (restore_sigframe(regs, frame))
 		goto badframe;
 
-	if (restore_altstack(frame->uc.uc_stack))
+	if (restore_altstack(&frame->uc.uc_stack))
 		goto badframe;
 
 	return regs->regs[0];