[PATCH] taint: fix forced rmmod

This taint didn't appear to be reported.

Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/panic.c b/kernel/panic.c
index a98656f049b37d91017c194bdd5d30ca1f17a616..6dddb56fbdad047ad6a2e110bed0cead21a13ead 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -110,6 +110,7 @@ EXPORT_SYMBOL(panic);
  *  'P' - Proprietary module has been loaded.
  *  'F' - Module has been forcibly loaded.
  *  'S' - SMP with CPUs not designed for SMP.
+ *  'R' - User forced a module unload.
  *  'M' - Machine had a machine check experience.
  *
  *     The string is overwritten by the next call to print_taint().
@@ -119,10 +120,11 @@ const char *print_tainted(void)
 {
        static char buf[20];
        if (tainted) {
-               snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c",
+               snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c",
                        tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G',
                        tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
                        tainted & TAINT_UNSAFE_SMP ? 'S' : ' ',
+                       tainted & TAINT_FORCED_RMMOD ? 'R' : ' ',
                        tainted & TAINT_MACHINE_CHECK ? 'M' : ' ');
        }
        else