Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-drm-fsl-dcu.git] / Documentation / oops-tracing.txt

diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt
index 2503404ae5c26bce481d56daecb008588e86102e..7d5b60dea551daacec4cc81006678957a38f1795 100644 (file)
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
@@ -234,6 +234,9 @@ characters, each representing a particular tainted value.
   6: 'B' if a page-release function has found a bad page reference or
      some unexpected page flags.
 
+  7: 'U' if a user or user application specifically requested that the
+     Tainted flag be set, ' ' otherwise.
+
 The primary reason for the 'Tainted: ' string is to tell kernel
 debuggers if this is a clean kernel or if anything unusual has
 occurred.  Tainting is permanent: even if an offending module is