linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: nikolay.borisov@arm.com (Nikolay Borisov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 6/7] ARM: traps: Make use of the frame_pointer macro
Date: Fri, 30 May 2014 17:59:50 +0100	[thread overview]
Message-ID: <1401469191-29232-7-git-send-email-nikolay.borisov@arm.com> (raw)
In-Reply-To: <1401469191-29232-1-git-send-email-nikolay.borisov@arm.com>

From: Nikolay Borisov <Nikolay.Borisov@arm.com>

Use the newly-introduced frame_pointer macro to extract
the correct FP based on whether we are in THUMB2 mode or not.

Signed-off-by: Nikolay Borisov <Nikolay.Borisov@arm.com>
---
 arch/arm/kernel/traps.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index abd2fc0..c8e4bb7 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -31,11 +31,13 @@
 #include <asm/exception.h>
 #include <asm/unistd.h>
 #include <asm/traps.h>
+#include <asm/ptrace.h>
 #include <asm/unwind.h>
 #include <asm/tls.h>
 #include <asm/system_misc.h>
 #include <asm/opcodes.h>
 
+
 static const char *handler[]= {
 	"prefetch abort",
 	"data abort",
@@ -184,7 +186,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
 		tsk = current;
 
 	if (regs) {
-		fp = regs->ARM_fp;
+		fp = frame_pointer(regs);
 		mode = processor_mode(regs);
 	} else if (tsk != current) {
 		fp = thread_saved_fp(tsk);
@@ -719,7 +721,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
 		dump_instr("", regs);
 		if (user_mode(regs)) {
 			__show_regs(regs);
-			c_backtrace(regs->ARM_fp, processor_mode(regs));
+			c_backtrace(frame_pointer(regs), processor_mode(regs));
 		}
 	}
 #endif
-- 
1.8.1.5

  parent reply	other threads:[~2014-05-30 16:59 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-30 16:59 [PATCH v2 0/7] Fix backtrace support in THUMB2 mode Nikolay Borisov
2014-05-30 16:59 ` [PATCH v2 1/7] ARM: Make thread_save_fp macro aware of " Nikolay Borisov
2014-05-30 16:59 ` [PATCH v2 2/7] ARM: Introduce arm_get_current_stack_frame() Nikolay Borisov
2014-05-30 17:20   ` Will Deacon
2014-06-02  8:05   ` Robert Richter
2014-05-30 16:59 ` [PATCH v3 3/7] ARM: perf: Make perf use arm_get_current_stackframe Nikolay Borisov
2014-05-30 16:59 ` [PATCH v2 4/7] ARM: time: Make use of arm_get_current_stackframe Nikolay Borisov
2014-05-30 16:59 ` [PATCH v2 5/7] ARM: unwind: Use arm_get_current_stackframe Nikolay Borisov
2014-05-30 16:59 ` Nikolay Borisov [this message]
2014-05-30 16:59 ` [PATCH v2 7/7] ARM: oprofile: Use of arm_get_current_stackframe Nikolay Borisov
2014-05-30 17:19 ` [PATCH v2 0/7] Fix backtrace support in THUMB2 mode Will Deacon
2014-05-31 18:31 ` Arnd Bergmann
2014-06-02  8:34   ` Nikolay Borisov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401469191-29232-7-git-send-email-nikolay.borisov@arm.com \
    --to=nikolay.borisov@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).