diff options
author | 2019-10-23 12:02:47 +0200 | |
---|---|---|
committer | 2019-10-23 12:10:05 +0200 | |
commit | 2e79e22e092acd55da0b2db066e4826d7d152c41 (patch) | |
tree | e7ec9782c0b7831c511af711424126a2b9a4eb07 /kernel/panic.c | |
parent | Merge tag 'du-next-20191016' of git://linuxtv.org/pinchartl/media into drm-next (diff) | |
parent | Linux 5.4-rc4 (diff) | |
download | linux-dev-2e79e22e092acd55da0b2db066e4826d7d152c41.tar.xz linux-dev-2e79e22e092acd55da0b2db066e4826d7d152c41.zip |
Merge v5.4-rc4 into drm-next
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.
Some adjacent changes conflicts, plus some clashes in i915 due to
cherry-picking and git trying to be helpful and leaving both versions
in.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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 47e8ebccc22b..f470a038b05b 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -180,6 +180,7 @@ void panic(const char *fmt, ...) * after setting panic_cpu) from invoking panic() again. */ local_irq_disable(); + preempt_disable_notrace(); /* * It's possible to come here directly from a panic-assertion and |