aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-11-21 00:40:40 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-23 05:39:56 -0500
commit45b797492a0758e64dff74e9db70e1f65e0603a5 (patch)
tree75db13ee888a6c7f90c92c17a743bff8ce42d86a /include/asm-generic
parent42f565e116e0408b5ddc21a33c4a4d41fd572420 (diff)
trace: consolidate unlikely and likely profiler
Impact: clean up to make one profiler of like and unlikely tracer The likely and unlikely profiler prints out the file and line numbers of the annotated branches that it is profiling. It shows the number of times it was correct or incorrect in its guess. Having two different files or sections for that matter to tell us if it was a likely or unlikely is pretty pointless. We really only care if it was correct or not. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 3b46ae464933..8bccb49981e5 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -46,12 +46,9 @@
46#endif 46#endif
47 47
48#ifdef CONFIG_TRACE_BRANCH_PROFILING 48#ifdef CONFIG_TRACE_BRANCH_PROFILING
49#define LIKELY_PROFILE() VMLINUX_SYMBOL(__start_likely_profile) = .; \ 49#define LIKELY_PROFILE() VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
50 *(_ftrace_likely) \ 50 *(_ftrace_annotated_branch) \
51 VMLINUX_SYMBOL(__stop_likely_profile) = .; \ 51 VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
52 VMLINUX_SYMBOL(__start_unlikely_profile) = .; \
53 *(_ftrace_unlikely) \
54 VMLINUX_SYMBOL(__stop_unlikely_profile) = .;
55#else 52#else
56#define LIKELY_PROFILE() 53#define LIKELY_PROFILE()
57#endif 54#endif