[kernel] r14202 - dists/trunk/linux-2.6/debian/templates/image.plain.bug

[Bastian Blank]

Author: waldi
Date: Wed Sep  2 09:39:20 2009
New Revision: 14202

Log:
debian/templates/image.plain.bug/include-1tainted
- Use bit positions for calculation.
- Remove spaces from output.

Modified:
   dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted

Modified: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted	Wed Sep  2 09:03:35 2009	(r14201)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted	Wed Sep  2 09:39:20 2009	(r14202)
@@ -1,28 +1,28 @@
-TAINT_PROPRIETARY_MODULE=1
-TAINT_FORCED_MODULE=2
-TAINT_UNSAFE_SMP=4
-TAINT_FORCED_RMMOD=8
-TAINT_MACHINE_CHECK=16
-TAINT_BAD_PAGE=32
-TAINT_USER=64
-TAINT_DIE=128
-TAINT_OVERRIDDEN_ACPI_TABLE=256
-TAINT_WARN=512
+TAINT_PROPRIETARY_MODULE=0
+TAINT_FORCED_MODULE=1
+TAINT_UNSAFE_SMP=2
+TAINT_FORCED_RMMOD=3
+TAINT_MACHINE_CHECK=4
+TAINT_BAD_PAGE=5
+TAINT_USER=6
+TAINT_DIE=7
+TAINT_OVERRIDDEN_ACPI_TABLE=8
+TAINT_WARN=9
 
 add_1tainted() {
   tainted=$(cat /proc/sys/kernel/tainted)
   if [ "$tainted" -gt 0 ]; then
     local s
-    [ $(($tainted & $TAINT_PROPRIETARY_MODULE)) -ne 0 ] && s="P" || s="G"
-    [ $(($tainted & $TAINT_FORCED_MODULE)) -ne 0 ] && s="${s}F" || s="$s "
-    [ $(($tainted & $TAINT_UNSAFE_SMP)) -ne 0 ] && s="${s}S" || s="$s "
-    [ $(($tainted & $TAINT_FORCED_RMMOD)) -ne 0 ] && s="${s}R" || s="$s "
-    [ $(($tainted & $TAINT_MACHINE_CHECK)) -ne 0 ] && s="${s}M" || s="$s "
-    [ $(($tainted & $TAINT_BAD_PAGE)) -ne 0 ] && s="${s}B" || s="$s "
-    [ $(($tainted & $TAINT_USER)) -ne 0 ] && s="${s}U" || s="$s "
-    [ $(($tainted & $TAINT_DIE)) -ne 0 ] && s="${s}D" || s="$s "
-    [ $(($tainted & $TAINT_OVERRIDDEN_ACPI_TABLE)) -ne 0 ] && s="${s}A" || s="$s "
-    [ $(($tainted & $TAINT_WARN)) -ne 0 ] && s="${s}W" || s="$s "
+    [ $(($tainted & 1<<$TAINT_PROPRIETARY_MODULE)) -ne 0 ] && s="P" || s="G"
+    [ $(($tainted & 1<<$TAINT_FORCED_MODULE)) -ne 0 ] && s="${s}F"
+    [ $(($tainted & 1<<$TAINT_UNSAFE_SMP)) -ne 0 ] && s="${s}S"
+    [ $(($tainted & 1<<$TAINT_FORCED_RMMOD)) -ne 0 ] && s="${s}R"
+    [ $(($tainted & 1<<$TAINT_MACHINE_CHECK)) -ne 0 ] && s="${s}M"
+    [ $(($tainted & 1<<$TAINT_BAD_PAGE)) -ne 0 ] && s="${s}B"
+    [ $(($tainted & 1<<$TAINT_USER)) -ne 0 ] && s="${s}U"
+    [ $(($tainted & 1<<$TAINT_DIE)) -ne 0 ] && s="${s}D"
+    [ $(($tainted & 1<<$TAINT_OVERRIDDEN_ACPI_TABLE)) -ne 0 ] && s="${s}A"
+    [ $(($tainted & 1<<$TAINT_WARN)) -ne 0 ] && s="${s}W"
     echo '** Tainted:' $s "($tainted)" >&3
     echo >&3
   else