From: Romain Naour Date: Tue, 4 Jul 2017 16:37:18 +0000 (+0200) Subject: nios2: fix wrong access to "SP" register in user_pt_regs X-Git-Tag: v4.18~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2a8b242be6b28ed77aa13e4b8acf785ada2a28b;p=strace nios2: fix wrong access to "SP" register in user_pt_regs Starting with linux commit v4.0-rc4~21^2, "SP" register is available via regs[PTR_SP] member of struct user_pt_regs. * linux/nios2/arch_regs.h (nios2_sp_ptr): Change type to "unsigned int *". * linux/nios2/arch_regs.c (nios2_sp_ptr): Likewise. Replace .sp with .regs[PTR_SP]. Fixes: http://autobuild.buildroot.net/results/b9f/b9fc25b82f3280872fe1593ac252a8529ba83576 Fixes: v4.16-34-g6117728a ("nios2: export nios2_sp_ptr") Signed-off-by: Romain Naour Signed-off-by: Dmitry V. Levin --- diff --git a/linux/nios2/arch_regs.c b/linux/nios2/arch_regs.c index 8a668bce..c18a3aa5 100644 --- a/linux/nios2/arch_regs.c +++ b/linux/nios2/arch_regs.c @@ -1,4 +1,4 @@ static struct user_pt_regs nios2_regs; -unsigned long *const nios2_sp_ptr = &nios2_regs.sp; +unsigned int *const nios2_sp_ptr = &nios2_regs.regs[PTR_SP]; # define ARCH_REGS_FOR_GETREGSET nios2_regs #define ARCH_PC_REG nios2_regs.regs[PTR_EA] diff --git a/linux/nios2/arch_regs.h b/linux/nios2/arch_regs.h index 7f344b53..c4230eda 100644 --- a/linux/nios2/arch_regs.h +++ b/linux/nios2/arch_regs.h @@ -1 +1 @@ -extern unsigned long *const nios2_sp_ptr; +extern unsigned int *const nios2_sp_ptr;