1 files 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)))         \
+                                __aligned(4)                            \
-                                __attribute__((__section__("_ftrace_annotated_branch"))) \
+                                __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)))                 \
+                        __aligned(4)                                    \
-                        __attribute__((__section__("_ftrace_branch")))  \
+                        __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;
 /**

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,
23	#define __branch_check__(x, expect, is_constant) ({ \	23	#define __branch_check__(x, expect, is_constant) ({ \
24	long ______r; \	24	long ______r; \
25	static struct ftrace_likely_data \	25	static struct ftrace_likely_data \
26	__attribute__((__aligned__(4))) \	26	__aligned(4) \
27	__attribute__((__section__("_ftrace_annotated_branch"))) \	27	__section("_ftrace_annotated_branch") \
28	______f = { \	28	______f = { \
29	.data.func = __func__, \	29	.data.func = __func__, \
30	.data.file = __FILE__, \	30	.data.file = __FILE__, \
@@ -59,8 +59,8 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
59	({ \	59	({ \
60	int ______r; \	60	int ______r; \
61	static struct ftrace_branch_data \	61	static struct ftrace_branch_data \
62	__attribute__((__aligned__(4))) \	62	__aligned(4) \
63	__attribute__((__section__("_ftrace_branch"))) \	63	__section("_ftrace_branch") \
64	______f = { \	64	______f = { \
65	.func = __func__, \	65	.func = __func__, \
66	.file = __FILE__, \	66	.file = __FILE__, \
@@ -146,7 +146,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
146	extern typeof(sym) sym; \	146	extern typeof(sym) sym; \
147	static const unsigned long __kentry_##sym \	147	static const unsigned long __kentry_##sym \
148	__used \	148	__used \
149	__attribute__((__section__("___kentry" "+" #sym ))) \	149	__section("___kentry" "+" #sym ) \
150	= (unsigned long)&sym;	150	= (unsigned long)&sym;
151	#endif	151	#endif
152		152
@@ -287,7 +287,7 @@ unsigned long read_word_at_a_time(const void *addr)
287	* visible to the compiler.	287	* visible to the compiler.
288	*/	288	*/
289	#define __ADDRESSABLE(sym) \	289	#define __ADDRESSABLE(sym) \
290	static void * __attribute__((__section__(".discard.addressable"), used)) \	290	static void * __section(".discard.addressable") __used \
291	__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;	291	__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
292		292
293	/**	293	/**