trace: rename unlikely profiler to branch profiler

Impact: name change of unlikely tracer and profiler

Ingo Molnar suggested changing the config from UNLIKELY_PROFILE
to BRANCH_PROFILING. I never did like the "unlikely" name so I
went one step farther, and renamed all the unlikely configurations
to a "BRANCH" variant.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 8abcaf821beb..9c89526b6b7c 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -159,7 +159,7 @@ config BOOT_TRACER
             selected, because the self-tests are an initcall as well and that
             would invalidate the boot trace. )
 
-config TRACE_UNLIKELY_PROFILE
+config TRACE_BRANCH_PROFILING
         bool "Trace likely/unlikely profiler"
         depends on DEBUG_KERNEL
         select TRACING
@@ -175,7 +175,7 @@ config TRACE_UNLIKELY_PROFILE
 
           Say N if unsure.
 
-config TRACING_UNLIKELY
+config TRACING_BRANCHES
         bool
         help
           Selected by tracers that will trace the likely and unlikely
@@ -183,10 +183,10 @@ config TRACING_UNLIKELY
           profiled. Profiling the tracing infrastructure can only happen
           when the likelys and unlikelys are not being traced.
 
-config UNLIKELY_TRACER
+config BRANCH_TRACER
         bool "Trace likely/unlikely instances"
-        depends on TRACE_UNLIKELY_PROFILE
-        select TRACING_UNLIKELY
+        depends on TRACE_BRANCH_PROFILING
+        select TRACING_BRANCHES
         help
           This traces the events of likely and unlikely condition
           calls in the kernel.  The difference between this and the