diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-03-10 04:19:28 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-10 04:19:28 -0500 |
commit | d88f1f1fdb9f8f60602b406c89342e113a19df7f (patch) | |
tree | 16da02010b66f7f54fde737c5c54e43980789f79 /include/linux/compiler.h | |
parent | 04860d48a8aba5b21ae5ba1f86b0d4e3bc628fff (diff) | |
parent | cdb06e9d8f520c969676e7d6778cffe5894f079f (diff) |
Merge branch 'linus' into locking/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/compiler.h')
-rw-r--r-- | include/linux/compiler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index e835fc0423ec..ab4711c63601 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
@@ -86,6 +86,11 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, | |||
86 | # define barrier_data(ptr) barrier() | 86 | # define barrier_data(ptr) barrier() |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | /* workaround for GCC PR82365 if needed */ | ||
90 | #ifndef barrier_before_unreachable | ||
91 | # define barrier_before_unreachable() do { } while (0) | ||
92 | #endif | ||
93 | |||
89 | /* Unreachable code */ | 94 | /* Unreachable code */ |
90 | #ifdef CONFIG_STACK_VALIDATION | 95 | #ifdef CONFIG_STACK_VALIDATION |
91 | /* | 96 | /* |