aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/Makefile
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-11-12 15:24:24 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-12 22:27:58 +0100
commit2ed84eeb8808cf3c9f039213ca137ffd7d753f0e (patch)
tree3aa22269a1fd5ed0b66826120ca9b572400962b5 /kernel/trace/Makefile
parent68d119f0a66f7e3663304343b072e56a2693446b (diff)
downloadkernel_goldelico_gta04-2ed84eeb8808cf3c9f039213ca137ffd7d753f0e.zip
kernel_goldelico_gta04-2ed84eeb8808cf3c9f039213ca137ffd7d753f0e.tar.gz
kernel_goldelico_gta04-2ed84eeb8808cf3c9f039213ca137ffd7d753f0e.tar.bz2
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>
Diffstat (limited to 'kernel/trace/Makefile')
-rw-r--r--kernel/trace/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index c938d03..0087df7 100644
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@ -11,9 +11,8 @@ obj-y += trace_selftest_dynamic.o
endif
# If unlikely tracing is enabled, do not trace these files
-ifdef CONFIG_TRACING_UNLIKELY
-KBUILD_CFLAGS += '-Dlikely(x)=likely_notrace(x)'
-KBUILD_CFLAGS += '-Dunlikely(x)=unlikely_notrace(x)'
+ifdef CONFIG_TRACING_BRANCHES
+KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
endif
obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o
@@ -31,6 +30,6 @@ obj-$(CONFIG_STACK_TRACER) += trace_stack.o
obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
obj-$(CONFIG_BOOT_TRACER) += trace_boot.o
obj-$(CONFIG_FUNCTION_RET_TRACER) += trace_functions_return.o
-obj-$(CONFIG_TRACE_UNLIKELY_PROFILE) += trace_unlikely.o
+obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_unlikely.o
libftrace-y := ftrace.o