Update of /cvsroot/linux-vax/kernel-2.5/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv3612/kernel
Modified Files:
panic.c
Log Message:
Merge with 2.5.55
Index: panic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/kernel/panic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- panic.c 10 Feb 2003 02:05:12 -0000 1.6
+++ panic.c 21 Jul 2003 23:52:05 -0000 1.7
@@ -106,7 +106,7 @@
/**
* print_tainted - return a string to represent the kernel taint state.
*
- * 'P' - Proprietory module has been loaded.
+ * 'P' - Proprietary module has been loaded.
* 'F' - Module has been forcibly loaded.
* 'S' - SMP with CPUs not designed for SMP.
*
@@ -118,7 +118,7 @@
static char buf[20];
if (tainted) {
snprintf(buf, sizeof(buf), "Tainted: %c%c%c",
- tainted & TAINT_PROPRIETORY_MODULE ? 'P' : 'G',
+ tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G',
tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
tainted & TAINT_UNSAFE_SMP ? 'S' : ' ');
}
|
