Commit 2f01b786 authored by Vincent Chen's avatar Vincent Chen Committed by Paul Walmsley
Browse files

riscv: remove the switch statement in do_trap_break() 



To make the code more straightforward, replace the switch statement
with an if statement.

Suggested-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
Signed-off-by: default avatarVincent Chen <vincent.chen@sifive.com>
[paul.walmsley@sifive.com: cleaned up patch description; updated to
 apply]
Link: https://lore.kernel.org/linux-riscv/20190927224711.GI4700@infradead.org/
Link: https://lore.kernel.org/linux-riscv/CABvJ_xiHJSB7P5QekuLRP=LBPzXXghAfuUpPUYb=a_HbnOQ6BA@mail.gmail.com/
Link: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/VDCU2WOB6KQISREO4V5DTXEI2M7VOV55/


Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
parent 4f5cafb5

arch/riscv/kernel/traps.c

+11 −11
Original line number Diff line number Diff line
@@ -124,24 +124,24 @@ static inline unsigned long get_break_insn_length(unsigned long pc) 


asmlinkage void do_trap_break(struct pt_regs *regs)

{

	if (!user_mode(regs)) {

	if (user_mode(regs)) {

		force_sig_fault(SIGTRAP, TRAP_BRKPT,

				(void __user *)(regs->sepc));

		return;

	}

#ifdef CONFIG_GENERIC_BUG

	{

		enum bug_trap_type type;



		type = report_bug(regs->sepc, regs);

		switch (type) {

#ifdef CONFIG_GENERIC_BUG

		case BUG_TRAP_TYPE_WARN:

		if (type == BUG_TRAP_TYPE_WARN) {

			regs->sepc += get_break_insn_length(regs->sepc);

			return;

		case BUG_TRAP_TYPE_BUG:

#endif /* CONFIG_GENERIC_BUG */

		default:

			die(regs, "Kernel BUG");

		}

	} else {

		force_sig_fault(SIGTRAP, TRAP_BRKPT,

				(void __user *)(regs->sepc));

	}

#endif /* CONFIG_GENERIC_BUG */



	die(regs, "Kernel BUG");

}



#ifdef CONFIG_GENERIC_BUG

CRA Git | Maintained and supported by SUSTech CRA and CCSE