diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-27 18:54:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-27 18:54:13 +0100 |
| commit | 8f677bc819e7a74cf10e30daf06e8b151d1e6a94 (patch) | |
| tree | 379e4e32a06dfb6d2ca3519ca4ef6b7507fad197 /kernel/panic.c | |
| parent | docs: driver-model: Add documentation for sync_state (diff) | |
| parent | Linux 5.4-rc5 (diff) | |
| download | wireguard-linux-8f677bc819e7a74cf10e30daf06e8b151d1e6a94.tar.xz wireguard-linux-8f677bc819e7a74cf10e30daf06e8b151d1e6a94.zip | |
Merge 5.4-rc5 into driver-core-next
We want the sysfs fix in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 |