diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-02-21 08:48:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-02-21 08:48:35 +0100 |
| commit | ed029343951f9f0c8600a484841c67e6c129717b (patch) | |
| tree | c66694a3f7a5c1f222e76f8f895b5fcc47ffe1f9 /include/linux/compiler-gcc.h | |
| parent | sched/fair: Remove stray space in #ifdef (diff) | |
| parent | Linux 4.16-rc2 (diff) | |
| download | wireguard-linux-ed029343951f9f0c8600a484841c67e6c129717b.tar.xz wireguard-linux-ed029343951f9f0c8600a484841c67e6c129717b.zip | |
Merge tag 'v4.16-rc2' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | include/linux/compiler-gcc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 631354acfa72..73bc63e0a1c4 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -167,8 +167,6 @@ #if GCC_VERSION >= 40100 # define __compiletime_object_size(obj) __builtin_object_size(obj, 0) - -#define __nostackprotector __attribute__((__optimize__("no-stack-protector"))) #endif #if GCC_VERSION >= 40300 @@ -196,6 +194,11 @@ #endif /* __CHECKER__ */ #endif /* GCC_VERSION >= 40300 */ +#if GCC_VERSION >= 40400 +#define __optimize(level) __attribute__((__optimize__(level))) +#define __nostackprotector __optimize("no-stack-protector") +#endif /* GCC_VERSION >= 40400 */ + #if GCC_VERSION >= 40500 #ifndef __CHECKER__ |