|
@@ -209,9 +209,6 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
|
|
if (fixup_exception(regs, trapnr))
|
|
if (fixup_exception(regs, trapnr))
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- if (fixup_bug(regs, trapnr))
|
|
|
|
- return 0;
|
|
|
|
-
|
|
|
|
tsk->thread.error_code = error_code;
|
|
tsk->thread.error_code = error_code;
|
|
tsk->thread.trap_nr = trapnr;
|
|
tsk->thread.trap_nr = trapnr;
|
|
die(str, regs, error_code);
|
|
die(str, regs, error_code);
|
|
@@ -292,6 +289,13 @@ static void do_error_trap(struct pt_regs *regs, long error_code, char *str,
|
|
|
|
|
|
RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
|
|
RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * WARN*()s end up here; fix them up before we call the
|
|
|
|
+ * notifier chain.
|
|
|
|
+ */
|
|
|
|
+ if (!user_mode(regs) && fixup_bug(regs, trapnr))
|
|
|
|
+ return;
|
|
|
|
+
|
|
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=
|
|
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=
|
|
NOTIFY_STOP) {
|
|
NOTIFY_STOP) {
|
|
cond_local_irq_enable(regs);
|
|
cond_local_irq_enable(regs);
|