diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /Documentation/oops-tracing.txt | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'Documentation/oops-tracing.txt')
| -rw-r--r-- | Documentation/oops-tracing.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt index b152e81da592..c10c022b911c 100644 --- a/Documentation/oops-tracing.txt +++ b/Documentation/oops-tracing.txt | |||
| @@ -257,6 +257,8 @@ characters, each representing a particular tainted value. | |||
| 257 | 257 | ||
| 258 | 10: 'W' if a warning has previously been issued by the kernel. | 258 | 10: 'W' if a warning has previously been issued by the kernel. |
| 259 | 259 | ||
| 260 | 11: 'C' if a staging driver has been loaded. | ||
| 261 | |||
| 260 | The primary reason for the 'Tainted: ' string is to tell kernel | 262 | The primary reason for the 'Tainted: ' string is to tell kernel |
| 261 | debuggers if this is a clean kernel or if anything unusual has | 263 | debuggers if this is a clean kernel or if anything unusual has |
| 262 | occurred. Tainting is permanent: even if an offending module is | 264 | occurred. Tainting is permanent: even if an offending module is |