---

yaml --- r: 153877 b: refs/heads/master c: 5ba3b24 h: refs/heads/master i: 153875: 32532a5 v: v3
git-mirror · Jun 23, 2009 · 3d83ec8 · 3d83ec8
1 parent 54f5229
commit 3d83ec8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 77 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a40494a62a11dbaf326397aa94b2018ead09884d
+refs/heads/master: 5ba3b249c9e08100b0822f17276348b3447d6ee3
diff --git a/trunk/arch/blackfin/kernel/Makefile b/trunk/arch/blackfin/kernel/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER)  += ftrace.o
 CFLAGS_REMOVE_ftrace.o = -pg
 
 obj-$(CONFIG_IPIPE)                  += ipipe.o
-obj-$(CONFIG_IPIPE_TRACE_MCOUNT)     += mcount.o
 obj-$(CONFIG_BFIN_GPTIMERS)          += gptimers.o
 obj-$(CONFIG_CPLB_INFO)              += cplbinfo.o
 obj-$(CONFIG_MODULES)                += module.o

diff --git a/trunk/arch/blackfin/kernel/ipipe.c b/trunk/arch/blackfin/kernel/ipipe.c
@@ -342,8 +342,3 @@ void ___ipipe_sync_pipeline(unsigned long syncmask)
 }
 
 EXPORT_SYMBOL(show_stack);
-
-#ifdef CONFIG_IPIPE_TRACE_MCOUNT
-void notrace _mcount(void);
-EXPORT_SYMBOL(_mcount);
-#endif /* CONFIG_IPIPE_TRACE_MCOUNT */
diff --git a/trunk/arch/blackfin/kernel/mcount.S b/trunk/arch/blackfin/kernel/mcount.S