3 files changed, 1 insertions, 5 deletions

diff --git a/kernel/profile.c b/kernel/profile.c
index 9830a037d8db..5b7d1ac7124c 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = {
 };
 
 #ifdef CONFIG_SMP
-static void __init profile_nop(void *unused)
+static inline void profile_nop(void *unused)
 {
 }
 
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 396fda034e3f..2596b5a968c4 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -259,9 +259,7 @@ static const char *trace_options[] = {
         "sched-tree",
         "ftrace_printk",
         "ftrace_preempt",
-#ifdef CONFIG_BRANCH_TRACER
         "branch",
-#endif
         "annotate",
         NULL
 };
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index cdbd5cc22be8..37947f6b92bf 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -471,9 +471,7 @@ enum trace_iterator_flags {
         TRACE_ITER_SCHED_TREE           = 0x200,
         TRACE_ITER_PRINTK               = 0x400,
         TRACE_ITER_PREEMPTONLY          = 0x800,
-#ifdef CONFIG_BRANCH_TRACER
         TRACE_ITER_BRANCH               = 0x1000,
-#endif
         TRACE_ITER_ANNOTATE             = 0x2000,
 };