From 100f8cda9c34054fc04b23447ba43e877c988874 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 12 Nov 2008 16:18:45 -0500 Subject: [PATCH] --- yaml --- r: 121106 b: refs/heads/master c: 94b80ffd650b22e1fd493ccf6bad7efda4b8ea85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/Makefile | 2 +- trunk/kernel/trace/{trace_unlikely.c => trace_branch.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/kernel/trace/{trace_unlikely.c => trace_branch.c} (100%) diff --git a/[refs] b/[refs] index 4707c634c545..c72348562abb 100644 --- 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 index 0087df7ba44e..1a8c9259dc69 100644 --- 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 b/trunk/kernel/trace/trace_branch.c similarity index 100% rename from trunk/kernel/trace/trace_unlikely.c rename to trunk/kernel/trace/trace_branch.c