- Update to 3.3-rc2.

[linux-flexiantxendom0-3.2.10.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 80aed44..c23e4dd 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -198,6 +198,10 @@ static const struct tnt tnts[] = {
        { TAINT_CRAP,                   'C', ' ' },
        { TAINT_FIRMWARE_WORKAROUND,    'I', ' ' },
        { TAINT_OOT_MODULE,             'O', ' ' },
+#ifdef CONFIG_ENTERPRISE_SUPPORT
+       { TAINT_NO_SUPPORT,             'N', ' ' },
+       { TAINT_EXTERNAL_SUPPORT,       'X', ' ' },
+#endif
 };
 
 /**
@@ -216,6 +220,8 @@ static const struct tnt tnts[] = {
  *  'C' - modules from drivers/staging are loaded.
  *  'I' - Working around severe firmware bug.
  *  'O' - Out-of-tree module has been loaded.
+ *  'N' - Unsuported modules loaded.
+ *  'X' - Modules with external support loaded.
  *
  *     The string is overwritten by the next call to print_tainted().
  */
@@ -251,6 +257,11 @@ unsigned long get_taint(void)
        return tainted_mask;
 }
 
+void add_nonfatal_taint(unsigned flag)
+{
+       set_bit(flag, &tainted_mask);
+}
+
 void add_taint(unsigned flag)
 {
        /*