diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-07 01:37:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-07 01:37:06 +0300 |
| commit | d0300e5e8d2fb74852f8116f26546e12cfa66735 (patch) | |
| tree | a6580aa74a0ebd7965dbc37767717b4f73dd9d79 /include/linux/kernel.h | |
| parent | c32909741fe93032705e6da29b564b8fec84f415 (diff) | |
| parent | 34c9ca37aaec2e307b837bb099d3b44f0ea04ddc (diff) | |
| download | linux-d0300e5e8d2fb74852f8116f26546e12cfa66735.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh to v4.15
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 4b484ab9e163..ce51455e2adf 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -549,7 +549,8 @@ extern enum system_states { #define TAINT_UNSIGNED_MODULE 13 #define TAINT_SOFTLOCKUP 14 #define TAINT_LIVEPATCH 15 -#define TAINT_FLAGS_COUNT 16 +#define TAINT_AUX 16 +#define TAINT_FLAGS_COUNT 17 struct taint_flag { char c_true; /* character printed when tainted */ |