diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:47:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:47:38 +0100 |
| commit | d3de94ba4e58e8043d500f7335797d6a2ac93248 (patch) | |
| tree | 8382a170965eec00ebfe62e7b42dfdea9ca44f54 /kernel/panic.c | |
| parent | Merge tag 'imx-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sh... (diff) | |
| parent | Linux 4.4-rc2 (diff) | |
| download | linux-d3de94ba4e58e8043d500f7335797d6a2ac93248.tar.xz linux-d3de94ba4e58e8043d500f7335797d6a2ac93248.zip | |
Merge tag 'v4.4-rc2' into fixes
Linux 4.4-rc2 is backmerged from the keystone fixes.
Diffstat (limited to '')
| -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(); |