diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-05 08:04:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-05 08:04:24 -0800 |
| commit | 62314f93f276df8689cfcb109e9459273fa3b6d8 (patch) | |
| tree | cf6a1067196ee8e44db57eb435cbc395807caa1e /kernel/panic.c | |
| parent | 078396ec4c69a680d32480766bb94bc8e93f99fd (diff) | |
| parent | 313b40e20d6fc3f1d1f7dffcde25d3b0ee8d01e9 (diff) | |
Merge "Merge android-4.4-p.197 (93ec8fb) into msm-4.4"
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 75f564a94a82..aceb10bcfc2f 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -90,6 +90,7 @@ void panic(const char *fmt, ...) * after the panic_lock is acquired) from invoking panic again. */ local_irq_disable(); + preempt_disable_notrace(); /* * It's possible to come here directly from a panic-assertion and |