Cc: Rasmus Villemoes <li...@rasmusvillemoes.dk>
Cc: Luc Van Oostenryck <luc.vanoostenr...@gmail.com>
Cc: Eli Friedman <efrie...@codeaurora.org>
Cc: Christopher Li <spa...@chrisli.org>
Cc: Kees Cook <keesc...@chromium.org>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Masahiro Yamada <yamada.masah...@socionext.com>
Cc: Joe Perches <j...@perches.com>
Cc: Dominique Martinet <asmad...@codewreck.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: linux-spa...@vger.kernel.org
Suggested-by: Nick Desaulniers <ndesaulni...@google.com>
Reviewed-by: Nick Desaulniers <ndesaulni...@google.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sando...@gmail.com>
---
include/linux/compiler.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 17ee9165ca51..b5fb034fa6fa 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -23,8 +23,8 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int
val,
#define __branch_check__(x, expect, is_constant) ({ \
long ______r; \
static struct ftrace_likely_data \
- __attribute__((__aligned__(4))) \
-
__attribute__((__section__("_ftrace_annotated_branch"))) \
+ __aligned(4) \
+ __section("_ftrace_annotated_branch") \
______f = { \
.data.func = __func__, \
.data.file = __FILE__, \
@@ -59,8 +59,8 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int
val,
({ \
int ______r; \
static struct ftrace_branch_data \
- __attribute__((__aligned__(4))) \
- __attribute__((__section__("_ftrace_branch"))) \
+ __aligned(4) \
+ __section("_ftrace_branch") \
______f = { \
.func = __func__, \
.file = __FILE__, \
@@ -146,7 +146,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int
val,
extern typeof(sym) sym; \
static const unsigned long __kentry_##sym \
__used \
- __attribute__((__section__("___kentry" "+" #sym ))) \
+ __section("___kentry" "+" #sym ) \
= (unsigned long)&sym;
#endif
@@ -287,7 +287,7 @@ unsigned long read_word_at_a_time(const void *addr)
* visible to the compiler.
*/
#define __ADDRESSABLE(sym) \
- static void * __attribute__((__section__(".discard.addressable"),
used)) \
+ static void * __section(".discard.addressable") __used \
__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
/**
--
2.17.1
