summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2018-08-01 11:22:56 -0700
committerHelge Deller <deller@gmx.de>2018-08-13 09:30:59 +0200
commit4a53ec1ccf932f86845c96a5092ba4507621c84d (patch)
treec122c5046c36b1d06d92c83e5c7adbf7c6709419 /arch
parent75ebedf1d26376cafad87b43196c15161463b82a (diff)
downloadtalos-obmc-linux-4a53ec1ccf932f86845c96a5092ba4507621c84d.tar.gz
talos-obmc-linux-4a53ec1ccf932f86845c96a5092ba4507621c84d.zip
parisc: prefer _THIS_IP_ and _RET_IP_ statement expressions
As part of the effort to reduce the code duplication between _THIS_IP_ and current_text_addr(), let's consolidate callers of current_text_addr() to use _THIS_IP_. Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/kernel/unwind.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 2ef83d78eec4..a4b430f440a9 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -439,8 +439,8 @@ unsigned long return_address(unsigned int level)
/* initialize unwind info */
asm volatile ("copy %%r30, %0" : "=r"(sp));
memset(&r, 0, sizeof(struct pt_regs));
- r.iaoq[0] = (unsigned long) current_text_addr();
- r.gr[2] = (unsigned long) __builtin_return_address(0);
+ r.iaoq[0] = _THIS_IP_;
+ r.gr[2] = _RET_IP_;
r.gr[30] = sp;
unwind_frame_init(&info, current, &r);
OpenPOWER on IntegriCloud