[PATCH] nios2/arch_regs: fix nios2_sp_ptr definition

Romain Naour romain.naour at smile.fr
Tue Jul 4 16:37:18 UTC 2017


The patch [1] introduced in streace 1.17 use the old way to access SP register as defined
for kernel headers < 4.0.
The kernel headers for nios2 has been changed in commit [2].

Use the new kernel header.

Fixes:
http://autobuild.buildroot.net/results/b9f/b9fc25b82f3280872fe1593ac252a8529ba83576

[1] https://github.com/strace/strace/commit/6117728aacf431a3e3c05761766c776874cc0861
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f

Signed-off-by: Romain Naour <romain.naour at smile.fr>
---
 linux/nios2/arch_regs.c | 2 +-
 linux/nios2/arch_regs.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/nios2/arch_regs.c b/linux/nios2/arch_regs.c
index 8a668bc..c18a3aa 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 7f344b5..c4230ed 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;
-- 
2.9.4





More information about the Strace-devel mailing list