diff options
author | 2021-01-25 11:08:34 +0900 | |
---|---|---|
committer | 2021-01-25 11:16:06 +0900 | |
commit | 2261352157a932717ec08b9dd18d1bfbb7c37c52 (patch) | |
tree | b48a3ea4060a7d078aecb97de07597a8eb24467a /include/linux/compiler_types.h | |
parent | drivers/soc/litex: Add restart handler (diff) | |
parent | openrisc: io: Add missing __iomem annotation to iounmap() (diff) | |
download | linux-rng-2261352157a932717ec08b9dd18d1bfbb7c37c52.tar.xz linux-rng-2261352157a932717ec08b9dd18d1bfbb7c37c52.zip |
Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
Pickup fixes that went upstream already in order to resolve conflicts in
litex_soc_ctrl.c between 5.11 fixes that went upstream and the
or1k-5.12-updates linux-next queue.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'include/linux/compiler_types.h')
-rw-r--r-- | include/linux/compiler_types.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index bbaa39e98f9f..e5dd5a4ae946 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -121,12 +121,6 @@ struct ftrace_likely_data { unsigned long constant; }; -#ifdef CONFIG_ENABLE_MUST_CHECK -#define __must_check __attribute__((__warn_unused_result__)) -#else -#define __must_check -#endif - #if defined(CC_USING_HOTPATCH) #define notrace __attribute__((hotpatch(0, 0))) #elif defined(CC_USING_PATCHABLE_FUNCTION_ENTRY) |