diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 04:01:53 -0500 |
| commit | 81e242d0efafb319938d511b115088a5c4523c91 (patch) | |
| tree | be22aa41db2288fd7999524d719f333c766a367f /kernel | |
| parent | a733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (diff) | |
| parent | 04d94886b47b5133915021dcfb1108a8576f6ea7 (diff) | |
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index d9e90cfe329..24af9f8bac9 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"); |