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 /include | |
| parent | a733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (diff) | |
| parent | 04d94886b47b5133915021dcfb1108a8576f6ea7 (diff) | |
Merge branches 'release' and 'dsdt-override' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 18222f267bc4..9e01f376840a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -243,6 +243,7 @@ extern enum system_states { | |||
| 243 | #define TAINT_BAD_PAGE (1<<5) | 243 | #define TAINT_BAD_PAGE (1<<5) |
| 244 | #define TAINT_USER (1<<6) | 244 | #define TAINT_USER (1<<6) |
| 245 | #define TAINT_DIE (1<<7) | 245 | #define TAINT_DIE (1<<7) |
| 246 | #define TAINT_OVERRIDDEN_ACPI_TABLE (1<<8) | ||
| 246 | 247 | ||
| 247 | extern void dump_stack(void) __cold; | 248 | extern void dump_stack(void) __cold; |
| 248 | 249 | ||