Commit a9e96e12 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

[PATCH] taint: fix forced rmmod

This taint didn't appear to be reported.
Signed-off-by: default avatarNick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 57b47f9d
...@@ -110,6 +110,7 @@ EXPORT_SYMBOL(panic); ...@@ -110,6 +110,7 @@ EXPORT_SYMBOL(panic);
* 'P' - Proprietary module has been loaded. * 'P' - Proprietary module has been loaded.
* 'F' - Module has been forcibly loaded. * 'F' - Module has been forcibly loaded.
* 'S' - SMP with CPUs not designed for SMP. * 'S' - SMP with CPUs not designed for SMP.
* 'R' - User forced a module unload.
* 'M' - Machine had a machine check experience. * 'M' - Machine had a machine check experience.
* *
* The string is overwritten by the next call to print_taint(). * The string is overwritten by the next call to print_taint().
...@@ -119,10 +120,11 @@ const char *print_tainted(void) ...@@ -119,10 +120,11 @@ const char *print_tainted(void)
{ {
static char buf[20]; static char buf[20];
if (tainted) { 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_PROPRIETARY_MODULE ? 'P' : 'G',
tainted & TAINT_FORCED_MODULE ? 'F' : ' ', tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
tainted & TAINT_UNSAFE_SMP ? 'S' : ' ', tainted & TAINT_UNSAFE_SMP ? 'S' : ' ',
tainted & TAINT_FORCED_RMMOD ? 'R' : ' ',
tainted & TAINT_MACHINE_CHECK ? 'M' : ' '); tainted & TAINT_MACHINE_CHECK ? 'M' : ' ');
} }
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment