diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /include/linux/kernel.h | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 196d1ea86df0..08fb02477641 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -458,7 +458,7 @@ extern enum system_states { | |||
| 458 | 458 | ||
| 459 | #define TAINT_PROPRIETARY_MODULE 0 | 459 | #define TAINT_PROPRIETARY_MODULE 0 |
| 460 | #define TAINT_FORCED_MODULE 1 | 460 | #define TAINT_FORCED_MODULE 1 |
| 461 | #define TAINT_UNSAFE_SMP 2 | 461 | #define TAINT_CPU_OUT_OF_SPEC 2 |
| 462 | #define TAINT_FORCED_RMMOD 3 | 462 | #define TAINT_FORCED_RMMOD 3 |
| 463 | #define TAINT_MACHINE_CHECK 4 | 463 | #define TAINT_MACHINE_CHECK 4 |
| 464 | #define TAINT_BAD_PAGE 5 | 464 | #define TAINT_BAD_PAGE 5 |