Merge tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next

[deliverable/linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 4d8d6f906decede78600ef0767770dd713f8b225..8136ad76e5fd3ea2bcc6d556a9508e86c49761aa 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -226,6 +226,7 @@ static const struct tnt tnts[] = {
        { TAINT_OOT_MODULE,             'O', ' ' },
        { TAINT_UNSIGNED_MODULE,        'E', ' ' },
        { TAINT_SOFTLOCKUP,             'L', ' ' },
+       { TAINT_LIVEPATCH,              'K', ' ' },
 };
 
 /**
@@ -246,6 +247,7 @@ static const struct tnt tnts[] = {
  *  'O' - Out-of-tree module has been loaded.
  *  'E' - Unsigned module has been loaded.
  *  'L' - A soft lockup has previously occurred.
+ *  'K' - Kernel has been live patched.
  *
  *     The string is overwritten by the next call to print_tainted().
  */