summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLen Brown2008-02-07 10:01:53 +0100
committerLen Brown2008-02-07 10:01:53 +0100
commit81e242d0efafb319938d511b115088a5c4523c91 (patch)
treebe22aa41db2288fd7999524d719f333c766a367f /kernel
parentMerge branches 'release' and 'fluff' into release (diff)
parentACPI: update intrd DSDT override console messages (diff)
downloadkernel-qcow2-linux-81e242d0efafb319938d511b115088a5c4523c91.tar.gz
kernel-qcow2-linux-81e242d0efafb319938d511b115088a5c4523c91.tar.xz
kernel-qcow2-linux-81e242d0efafb319938d511b115088a5c4523c91.zip
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index d9e90cfe3298..24af9f8bac99 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -161,7 +161,7 @@ const char *print_tainted(void)
{
static char buf[20];
if (tainted) {
- snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c%c%c%c",
+ snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c%c%c%c%c",
tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G',
tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
tainted & TAINT_UNSAFE_SMP ? 'S' : ' ',
@@ -169,7 +169,8 @@ const char *print_tainted(void)
tainted & TAINT_MACHINE_CHECK ? 'M' : ' ',
tainted & TAINT_BAD_PAGE ? 'B' : ' ',
tainted & TAINT_USER ? 'U' : ' ',
- tainted & TAINT_DIE ? 'D' : ' ');
+ tainted & TAINT_DIE ? 'D' : ' ',
+ tainted & TAINT_OVERRIDDEN_ACPI_TABLE ? 'A' : ' ');
}
else
snprintf(buf, sizeof(buf), "Not tainted");