diff options
author | 2021-05-18 09:45:08 +0300 | |
---|---|---|
committer | 2021-05-18 09:45:08 +0300 | |
commit | 85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34 (patch) | |
tree | dc6b176404218efac28a4a1a0c240cb36f1e9173 /include/linux/compiler_types.h | |
parent | Merge branch 'omap-for-v5.13/ti-sysc' into fixes (diff) | |
parent | ARM: OMAP2+: Fix build warning when mmc_omap is not built (diff) | |
download | linux-rng-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.tar.xz linux-rng-85ebe5aeef9b0bf4c91ff91652b32f9c54f71d34.zip |
Merge branch 'fixes-rc1' into fixes
Diffstat (limited to 'include/linux/compiler_types.h')
-rw-r--r-- | include/linux/compiler_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index e5dd5a4ae946..d29bda7f6ebd 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -242,6 +242,14 @@ struct ftrace_likely_data { # define __noscs #endif +#ifndef __nocfi +# define __nocfi +#endif + +#ifndef __cficanonical +# define __cficanonical +#endif + #ifndef asm_volatile_goto #define asm_volatile_goto(x...) asm goto(x) #endif |