microblaze: ftrace: enable HAVE_FUNCTION_TRACE_MCOUNT_TEST
authorMichal Simek <monstr@monstr.eu>
Mon, 16 Nov 2009 08:55:08 +0000 (09:55 +0100)
committerMichal Simek <monstr@monstr.eu>
Mon, 14 Dec 2009 07:40:10 +0000 (08:40 +0100)
Implement MCOUNT_TEST in asm code - it is faster than use
generic code

Signed-off-by: Michal Simek <monstr@monstr.eu>
arch/microblaze/Kconfig
arch/microblaze/kernel/mcount.S

index 18003ca..cccf3ad 100644 (file)
@@ -7,6 +7,7 @@ config MICROBLAZE
        def_bool y
        select HAVE_LMB
        select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select USB_ARCH_HAS_EHCI
        select ARCH_WANT_OPTIONAL_GPIOLIB
 
index a257a1b..97eef3e 100644 (file)
@@ -85,6 +85,11 @@ ENTRY(ftrace_stub)
 ENTRY(_mcount)
        SAVE_REGS
        swi     r15, r1, 0;
+       /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
+       lwi     r5, r0, function_trace_stop;
+       bneid   r5, end;
+       nop;
+       /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
        /* MS: test function trace if is taken or not */
        lwi     r20, r0, ftrace_trace_function;
        addik   r6, r0, ftrace_stub;