---

yaml --- r: 121106 b: refs/heads/master c: 94b80ff h: refs/heads/master v: v3
git-mirror · Nov 12, 2008 · 100f8cd · 100f8cd
1 parent 90bb3d9
commit 100f8cd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80e5ea4506791af206266c5921c97f11d3b17866
+refs/heads/master: 94b80ffd650b22e1fd493ccf6bad7efda4b8ea85
diff --git a/trunk/kernel/trace/Makefile b/trunk/kernel/trace/Makefile
@@ -30,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_BRANCH_PROFILING) += trace_unlikely.o
+obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_branch.o
 
 libftrace-y := ftrace.o
diff --git a/trunk/kernel/trace/trace_unlikely.c → trunk/kernel/trace/trace_branch.c b/trunk/kernel/trace/trace_unlikely.c → trunk/kernel/trace/trace_branch.c