diff options
author | Jiri Kosina | 2015-12-04 22:48:30 +0100 |
---|---|---|
committer | Jiri Kosina | 2015-12-04 22:48:30 +0100 |
commit | fc284d631894d8673d229fad92762b66c9875cab (patch) | |
tree | 7b530667b9f7c5c4899c024abda518283abf80b4 /kernel/panic.c | |
parent | livepatch: function,sympos scheme in livepatch sysfs directory (diff) | |
parent | module: keep percpu symbols in module's symtab (diff) | |
download | kernel-qcow2-linux-fc284d631894d8673d229fad92762b66c9875cab.tar.gz kernel-qcow2-linux-fc284d631894d8673d229fad92762b66c9875cab.tar.xz kernel-qcow2-linux-fc284d631894d8673d229fad92762b66c9875cab.zip |
Merge branch 'from-rusty/modules-next' into for-4.5/core
As agreed with Rusty, we're taking a current module-next pile through
livepatching.git, as it contains solely patches that are pre-requisity
for module page protection cleanups in livepatching. Rusty will be
restarting module-next from scratch.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'kernel/panic.c')
-rw-r--r-- | kernel/panic.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 4579dbb7ed87..4b150bc0c6c1 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -152,8 +152,11 @@ void panic(const char *fmt, ...) * We may have ended up stopping the CPU holding the lock (in * smp_send_stop()) while still having some valuable data in the console * buffer. Try to acquire the lock then release it regardless of the - * result. The release will also print the buffers out. + * result. The release will also print the buffers out. Locks debug + * should be disabled to avoid reporting bad unlock balance when + * panic() is not being callled from OOPS. */ + debug_locks_off(); console_trylock(); console_unlock(); |