aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-11-18 19:43:46 -0700
committerJens Axboe <axboe@fb.com>2014-11-18 19:43:46 -0700
commitb3521729769ec71567a2e32a38609f87e781e41b (patch)
tree66a8494968706420c3eb043caa5868702d440d18 /kernel/panic.c
parentNVMe: enable IO stats by default (diff)
parentLinux 3.18-rc5 (diff)
downloadlinux-dev-b3521729769ec71567a2e32a38609f87e781e41b.tar.xz
linux-dev-b3521729769ec71567a2e32a38609f87e781e41b.zip
Merge branch 'master' into for-3.19/drivers
Diffstat (limited to 'kernel/panic.c')
-rw-r--r--kernel/panic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index d09dc5c32c67..cf80672b7924 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -244,6 +244,7 @@ static const struct tnt tnts[] = {
* 'I' - Working around severe firmware bug.
* 'O' - Out-of-tree module has been loaded.
* 'E' - Unsigned module has been loaded.
+ * 'L' - A soft lockup has previously occurred.
*
* The string is overwritten by the next call to print_tainted().
*/