aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 12:50:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 12:50:12 -0400
commit26e9a397774a0e94efbb8a0bf4a952c28d808cab (patch)
treefee2211b32a30c71bd22543acb791feeebd91b35 /kernel/panic.c
parentbdbf0ac7e187b2b757216e653e64f8b808b9077e (diff)
parent99e06e372378c5833a0c60274b645dfb2e4a4b08 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (25 commits) staging: at76_usb wireless driver Staging: workaround build system bug Staging: Lindent sxg.c Staging: SLICOSS: Call pci_release_regions at driver exit Staging: SLICOSS: Fix remaining type names Staging: SLICOSS: Fix warnings due to static usage Staging: SLICOSS: lots of checkpatch fixes Staging: go7007 v4l fixes Staging: Fix gcc warnings in sxg Staging: add echo cancelation module Staging: add wlan-ng prism2 usb driver Staging: add w35und wifi driver Staging: USB/IP: add host driver Staging: USB/IP: add client driver Staging: USB/IP: add common functions needed Staging: add the go7007 video driver Staging: add me4000 pci data collection driver Staging: add me4000 firmware files Staging: add sxg network driver Staging: add Alacritech slicoss network driver ... Fixed up conflicts due to taint flags changes and MAINTAINERS cleanup in MAINTAINERS, include/linux/kernel.h and kernel/panic.c.
Diffstat (limited to 'kernel/panic.c')
-rw-r--r--kernel/panic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index f290e8e866f6..bda561ef3cdf 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -161,6 +161,7 @@ static const struct tnt tnts[] = {
161 { TAINT_DIE, 'D', ' ' }, 161 { TAINT_DIE, 'D', ' ' },
162 { TAINT_OVERRIDDEN_ACPI_TABLE, 'A', ' ' }, 162 { TAINT_OVERRIDDEN_ACPI_TABLE, 'A', ' ' },
163 { TAINT_WARN, 'W', ' ' }, 163 { TAINT_WARN, 'W', ' ' },
164 { TAINT_CRAP, 'C', ' ' },
164}; 165};
165 166
166/** 167/**
@@ -175,6 +176,7 @@ static const struct tnt tnts[] = {
175 * 'U' - Userspace-defined naughtiness. 176 * 'U' - Userspace-defined naughtiness.
176 * 'A' - ACPI table overridden. 177 * 'A' - ACPI table overridden.
177 * 'W' - Taint on warning. 178 * 'W' - Taint on warning.
179 * 'C' - modules from drivers/staging are loaded.
178 * 180 *
179 * The string is overwritten by the next call to print_taint(). 181 * The string is overwritten by the next call to print_taint().
180 */ 182 */