p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LoongArch: Make compute_return_era() return void 

compute_return_era() always returns 0, make it return void,
and then no need to check its return value for its callers.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
This commit is contained in:
Tiezhu Yang 2022-06-18 16:39:11 +08:00 committed by Huacai Chen
parent ad82eef3ce
commit ea18d43478
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/loongarch/include/asm/branch.h
View File

@ -12,10 +12,9 @@ static inline unsigned long exception_era(struct pt_regs *regs)
return regs->csr_era; return regs->csr_era;
} }
static inline int compute_return_era(struct pt_regs *regs) static inline void compute_return_era(struct pt_regs *regs)
{ {
regs->csr_era += 4; regs->csr_era += 4;
return 0;
} }
#endif /* _ASM_BRANCH_H */ #endif /* _ASM_BRANCH_H */

3
arch/loongarch/kernel/traps.c
View File

@ -475,8 +475,7 @@ asmlinkage void noinstr do_ri(struct pt_regs *regs)
die_if_kernel("Reserved instruction in kernel code", regs); die_if_kernel("Reserved instruction in kernel code", regs);
if (unlikely(compute_return_era(regs) < 0)) compute_return_era(regs);
goto out;
if (unlikely(get_user(opcode, era) < 0)) { if (unlikely(get_user(opcode, era) < 0)) {
status = SIGSEGV; status = SIGSEGV;