summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorNick Piggin <nickpiggin@yahoo.com.au>2004-10-18 18:14:50 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-18 18:14:50 -0700
commita9e96e12dbfd97bd9d42523e85f7d67a6ba9a643 (patch)
tree9f31510235e7d03426a83726d9d612ef3e4489cd /kernel
parent57b47f9da9d62a94f76928872c9ac93721c006de (diff)
[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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index a98656f049b3..6dddb56fbdad 100644
--- 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