Update of /cvsroot/linux-vax/kernel-2.5/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv2713/kernel
Modified Files:
panic.c
Log Message:
Merge Linus' 2.5.4 release. Major change is the splitting of task_struct
into task_struct and struct thread_info.
Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panic.c 20 May 2002 00:33:39 -0000 1.2
+++ panic.c 29 Oct 2002 00:52:51 -0000 1.3
@@ -106,6 +106,10 @@
/**
* print_tainted - return a string to represent the kernel taint state.
*
+ * 'P' - Proprietory module has been loaded.
+ * 'F' - Module has been forcibly loaded.
+ * 'S' - SMP with CPUs not designed for SMP.
+ *
* The string is overwritten by the next call to print_taint().
*/
@@ -113,9 +117,10 @@
{
static char buf[20];
if (tainted) {
- snprintf(buf, sizeof(buf), "Tainted: %c%c",
- tainted & 1 ? 'P' : 'G',
- tainted & 2 ? 'F' : ' ');
+ snprintf(buf, sizeof(buf), "Tainted: %c%c%c",
+ tainted & TAINT_PROPRIETORY_MODULE ? 'P' : 'G',
+ tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
+ tainted & TAINT_UNSAFE_SMP ? 'S' : ' ');
}
else
snprintf(buf, sizeof(buf), "Not tainted");
|
