1 files changed, 22 insertions, 11 deletions

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index cf0fa5d86059..627e697e5d25 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -27,7 +27,11 @@ extern void __chk_user_ptr(const volatile void __user *);
 extern void __chk_io_ptr(const volatile void __iomem *);
 # define ACCESS_PRIVATE(p, member) (*((typeof((p)->member) __force *) &(p)->member))
 #else /* __CHECKER__ */
-# define __user
+# ifdef STRUCTLEAK_PLUGIN
+#  define __user __attribute__((user))
+# else
+#  define __user
+# endif
 # define __kernel
 # define __safe
 # define __force
@@ -101,29 +105,36 @@ struct ftrace_branch_data {
         };
 };
 
+struct ftrace_likely_data {
+        struct ftrace_branch_data       data;
+        unsigned long                   constant;
+};
+
 /*
  * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
  * to disable branch tracing on a per file basis.
  */
 #if defined(CONFIG_TRACE_BRANCH_PROFILING) \
     && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
-void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+void ftrace_likely_update(struct ftrace_likely_data *f, int val,
+                          int expect, int is_constant);
 
 #define likely_notrace(x)       __builtin_expect(!!(x), 1)
 #define unlikely_notrace(x)     __builtin_expect(!!(x), 0)
 
-#define __branch_check__(x, expect) ({                                  \
+#define __branch_check__(x, expect, is_constant) ({                     \
                         int ______r;                                    \
-                        static struct ftrace_branch_data                \
+                        static struct ftrace_likely_data                \
                                 __attribute__((__aligned__(4)))         \
                                 __attribute__((section("_ftrace_annotated_branch"))) \
                                 ______f = {                             \
-                                .func = __func__,                       \
-                                .file = __FILE__,                       \
-                                .line = __LINE__,                       \
+                                .data.func = __func__,                  \
+                                .data.file = __FILE__,                  \
+                                .data.line = __LINE__,                  \
                         };                                              \
-                        ______r = likely_notrace(x);                    \
-                        ftrace_likely_update(&______f, ______r, expect); \
+                        ______r = __builtin_expect(!!(x), expect);      \
+                        ftrace_likely_update(&______f, ______r,         \
+                                             expect, is_constant);      \
                         ______r;                                        \
                 })
 
@@ -133,10 +144,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  * written by Daniel Walker.
  */
 # ifndef likely
-#  define likely(x)     (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 1))
+#  define likely(x)     (__branch_check__(x, 1, __builtin_constant_p(x)))
 # endif
 # ifndef unlikely
-#  define unlikely(x)   (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 0))
+#  define unlikely(x)   (__branch_check__(x, 0, __builtin_constant_p(x)))
 # endif
 
 #ifdef CONFIG_PROFILE_ALL_BRANCHES