Merge tag 'for-linus-20191012' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / riscv / kernel / traps.c

diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c
index 424eb72..93742df 100644 (file)
--- a/arch/riscv/kernel/traps.c
+++ b/arch/riscv/kernel/traps.c
@@ -124,24 +124,24 @@ static inline unsigned long get_break_insn_length(unsigned long pc)
 
 asmlinkage void do_trap_break(struct pt_regs *regs)
 {
-#ifdef CONFIG_GENERIC_BUG
        if (!user_mode(regs)) {
                enum bug_trap_type type;
 
                type = report_bug(regs->sepc, regs);
                switch (type) {
-               case BUG_TRAP_TYPE_NONE:
-                       break;
+#ifdef CONFIG_GENERIC_BUG
                case BUG_TRAP_TYPE_WARN:
                        regs->sepc += get_break_insn_length(regs->sepc);
-                       break;
+                       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 */
-
-       force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)(regs->sepc));
 }
 
 #ifdef CONFIG_GENERIC_BUG