2 files changed, 13 insertions, 7 deletions

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index cf0fa5d86059..bbbe1570de1c 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -107,12 +107,13 @@ struct ftrace_branch_data {
  */
 #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_branch_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                \
                                 __attribute__((__aligned__(4)))         \
@@ -122,8 +123,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
                                 .file = __FILE__,                       \
                                 .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 +135,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
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 75489de546b6..7afe426ea528 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -200,8 +200,12 @@ void trace_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 }
 #endif /* CONFIG_BRANCH_TRACER */
 
-void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect)
+void ftrace_likely_update(struct ftrace_branch_data *f, int val,
+                          int expect, int is_constant)
 {
+        /* A constant is always correct */
+        if (is_constant)
+                val = expect;
         /*
          * I would love to have a trace point here instead, but the
          * trace point code is so inundated with unlikely and likely