1 files changed, 13 insertions, 11 deletions

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 4170fcee5adb..18c80cfa4fc4 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__,                       \
@@ -115,7 +115,10 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
 # define ASM_UNREACHABLE
 #endif
 #ifndef unreachable
-# define unreachable() do { annotate_reachable(); do { } while (1); } while (0)
+# define unreachable() do {             \
+        annotate_unreachable();         \
+        __builtin_unreachable();        \
+} while (0)
 #endif
 
 /*
@@ -137,7 +140,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 ), used))   \
+        __section("___kentry" "+" #sym )                        \
         = (unsigned long)&sym;
 #endif
 
@@ -278,7 +281,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;
 
 /**
@@ -331,10 +334,6 @@ static inline void *offset_to_ptr(const int *off)
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
-#ifndef __optimize
-# define __optimize(level)
-#endif
-
 /* Compile time object size, -1 for unknown */
 #ifndef __compiletime_object_size
 # define __compiletime_object_size(obj) -1
@@ -376,4 +375,7 @@ static inline void *offset_to_ptr(const int *off)
         compiletime_assert(__native_word(t),                            \
                 "Need native word sized stores/loads for atomicity.")
 
+/* &a[0] degrades to a pointer: a different type from an array */
+#define __must_be_array(a)      BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
+
 #endif /* __LINUX_COMPILER_H */