From d1c71a9535ea227e9f63703a29326c61b6f03020 Mon Sep 17 00:00:00 2001 From: Wu Zhangjin Date: Fri, 20 Nov 2009 20:34:30 +0800 Subject: [PATCH] --- yaml --- r: 177898 b: refs/heads/master c: 69a7d1b3ec64786cfc8a16ef3e8585d1f93d3944 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/Kconfig | 1 + trunk/arch/mips/kernel/mcount.S | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8147f2e61198..9a7d9cc31acb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2bb0762993e11363d8343127516b8fe88f9006f +refs/heads/master: 69a7d1b3ec64786cfc8a16ef3e8585d1f93d3944 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index 632dba2ac300..d203dbfa8037 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -6,6 +6,7 @@ config MIPS select HAVE_OPROFILE select HAVE_ARCH_KGDB select HAVE_FUNCTION_TRACER + select HAVE_FUNCTION_TRACE_MCOUNT_TEST # Horrible source of confusion. Die, die, die ... select EMBEDDED select RTC_LIB if !MACH_LOONGSON diff --git a/trunk/arch/mips/kernel/mcount.S b/trunk/arch/mips/kernel/mcount.S index cebcc3c11305..cbb45edad464 100644 --- a/trunk/arch/mips/kernel/mcount.S +++ b/trunk/arch/mips/kernel/mcount.S @@ -59,6 +59,9 @@ .endm NESTED(_mcount, PT_SIZE, ra) + lw t0, function_trace_stop + bnez t0, ftrace_stub + nop PTR_LA t0, ftrace_stub PTR_L t1, ftrace_trace_function /* Prepare t1 for (1) */ bne t0, t1, static_trace