diff options
| author | Christoph Hellwig | 2019-04-15 11:14:40 +0200 |
|---|---|---|
| committer | Palmer Dabbelt | 2019-04-25 23:51:11 +0200 |
| commit | 6ab77af4b0ee09b58ace90aeb9b1b84f4605b859 (patch) | |
| tree | 0965302ff07917cfc8ba31698dc4c4488e901e6b /arch/riscv/kernel | |
| parent | riscv: remove unreachable !HAVE_FUNCTION_GRAPH_RET_ADDR_PTR code (diff) | |
| download | kernel-qcow2-linux-6ab77af4b0ee09b58ace90aeb9b1b84f4605b859.tar.gz kernel-qcow2-linux-6ab77af4b0ee09b58ace90aeb9b1b84f4605b859.tar.xz kernel-qcow2-linux-6ab77af4b0ee09b58ace90aeb9b1b84f4605b859.zip | |
riscv: remove duplicate macros from ptrace.h
No need to have two names for the same thing.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'arch/riscv/kernel')
| -rw-r--r-- | arch/riscv/kernel/stacktrace.c | 10 | ||||
| -rw-r--r-- | arch/riscv/kernel/traps.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c index 855036c440c1..a4386a0c8f67 100644 --- a/arch/riscv/kernel/stacktrace.c +++ b/arch/riscv/kernel/stacktrace.c @@ -33,9 +33,9 @@ static void notrace walk_stackframe(struct task_struct *task, unsigned long fp, sp, pc; if (regs) { - fp = GET_FP(regs); - sp = GET_USP(regs); - pc = GET_IP(regs); + fp = frame_pointer(regs); + sp = user_stack_pointer(regs); + pc = instruction_pointer(regs); } else if (task == NULL || task == current) { const register unsigned long current_sp __asm__ ("sp"); fp = (unsigned long)__builtin_frame_address(0); @@ -78,8 +78,8 @@ static void notrace walk_stackframe(struct task_struct *task, unsigned long *ksp; if (regs) { - sp = GET_USP(regs); - pc = GET_IP(regs); + sp = user_stack_pointer(regs); + pc = instruction_pointer(regs); } else if (task == NULL || task == current) { const register unsigned long current_sp __asm__ ("sp"); sp = current_sp; diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 24a9333dda2c..86731a2fa218 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -70,7 +70,7 @@ void do_trap(struct pt_regs *regs, int signo, int code, && printk_ratelimit()) { pr_info("%s[%d]: unhandled signal %d code 0x%x at 0x" REG_FMT, tsk->comm, task_pid_nr(tsk), signo, code, addr); - print_vma_addr(KERN_CONT " in ", GET_IP(regs)); + print_vma_addr(KERN_CONT " in ", instruction_pointer(regs)); pr_cont("\n"); show_regs(regs); } |