Merge git://git.marvell.com/orion into devel

[linux-2.6-omap-h63xx.git] / arch / arm / kernel / ftrace.c

diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 76d50e6091bc5694d19a6d9fab0b59284cd311fd..c638427662291c2fbd28d259b6121286d245d1d3 100644 (file)
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -95,20 +95,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
        return ret;
 }
 
-int ftrace_mcount_set(unsigned long *data)
-{
-       unsigned long pc, old;
-       unsigned long *addr = data;
-       unsigned char *new;
-
-       pc = (unsigned long)&mcount_call;
-       memcpy(&old, &mcount_call, MCOUNT_INSN_SIZE);
-       new = ftrace_call_replace(pc, *addr);
-       *addr = ftrace_modify_code(pc, (unsigned char *)&old, new);
-       return 0;
-}
-
-/* run from kstop_machine */
+/* run from ftrace_init with irqs disabled */
 int __init ftrace_dyn_arch_init(void *data)
 {
        ftrace_mcount_set(data);