Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753706AbZJUOfe (ORCPT ); Wed, 21 Oct 2009 10:35:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753693AbZJUOfb (ORCPT ); Wed, 21 Oct 2009 10:35:31 -0400 Received: from mail-fx0-f218.google.com ([209.85.220.218]:64251 "EHLO mail-fx0-f218.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753666AbZJUOf3 (ORCPT ); Wed, 21 Oct 2009 10:35:29 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=MWukmIfelNqR8gkEOkrmicKcJWkhPep7sow7KrZfqs/gPMbSbIRmm1A34ab1k1R9CF z715JEbMQLmP+5YxijmDRjpA37mkgRXM3KXUmLQ6FKTl39emKl0IaOdf1KB8bKWc23xb r0XkB/+m1hNfnXGRm72Gm5MFtBIFcY9vmIxUY= From: Wu Zhangjin To: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org Cc: Wu Zhangjin , Thomas Gleixner , Ralf Baechle , Nicholas Mc Guire , Steven Rostedt Subject: [PATCH -v4 5/9] tracing: enable HAVE_FUNCTION_TRACE_MCOUNT_TEST for MIPS Date: Wed, 21 Oct 2009 22:34:59 +0800 Message-Id: <96110ea5dd4d3d54eb97d0bb708a5bd81c7a50b5.1256135456.git.wuzhangjin@gmail.com> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: References: <028867b99ec532b84963a35e7d552becc783cafc.1256135456.git.wuzhangjin@gmail.com> <2f73eae542c47ac5bbb9f7280e6c0271d193e90d.1256135456.git.wuzhangjin@gmail.com> <3f0d3515f74a58f4cfd11e61b62a129fdc21e3a7.1256135456.git.wuzhangjin@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1242 Lines: 41 Signed-off-by: Wu Zhangjin --- arch/mips/Kconfig | 1 + arch/mips/kernel/mcount.S | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6b33e88..a9bd992 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -5,6 +5,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 !LEMOTE_FULOONG2E diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S index 5bb8055..82e54ab 100644 --- a/arch/mips/kernel/mcount.S +++ b/arch/mips/kernel/mcount.S @@ -69,6 +69,10 @@ NESTED(_mcount, PT_SIZE, ra) RESTORE_SP_FOR_32BIT + lw t0, function_trace_stop + bnez t0, ftrace_stub + nop + PTR_LA t0, ftrace_stub PTR_L t1, ftrace_trace_function /* please don't use t1 later, safe? */ bne t0, t1, static_trace -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/