Home » Mailing list archives » git-commits-head » 2010 » April » 13

sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up.

Previous thread: sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86. by Linux Kernel Mailing List on Tuesday, April 13, 2010 - 12:59 pm. (1 message)

Next thread: sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs. by Linux Kernel Mailing List on Tuesday, April 13, 2010 - 12:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up.
Date: Tuesday, April 13, 2010 - 12:59 pm

Gitweb:     http://git.kernel.org/linus/63b754957371c23b7515399a977a2e1d361a036c
Commit:     63b754957371c23b7515399a977a2e1d361a036c
Parent:     0c25e9e6cbe7b233bb91d14d0e2c258bf8e6ec83
Author:     David S. Miller <davem@davemloft.net>
AuthorDate: Mon Apr 12 22:35:24 2010 -0700
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Mon Apr 12 22:35:24 2010 -0700

    sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up.
    
    Check function_trace_stop at ftrace_caller
    
    Toss mcount_call and dummy call of ftrace_stub, unnecessary.
    
    Document problems we'll have if the final kernel image link
    ever turns on relaxation.
    
    Properly size 'ftrace_call' so it looks right when inspecting
    instructions under gdb et al.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/sparc/Kconfig      |    1 +
 arch/sparc/lib/mcount.S |   22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 6db5136..035304c 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -37,6 +37,7 @@ config SPARC64
 	def_bool 64BIT
 	select ARCH_SUPPORTS_MSI
 	select HAVE_FUNCTION_TRACER
+	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
 	select HAVE_KRETPROBES
 	select HAVE_KPROBES
 	select HAVE_LMB
diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S
index 24b8b12..7047997 100644
--- a/arch/sparc/lib/mcount.S
+++ b/arch/sparc/lib/mcount.S
@@ -96,13 +96,12 @@ mcount:
 #endif
 #ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
-	mov		%o7, %o0
-	.globl		mcount_call
-mcount_call:
-	call		ftrace_stub
-	 mov		%o0, %o7
+	/* Do nothing, the retl/nop below is all we need.  */
 #else
-	sethi		%hi(ftrace_trace_function), %g1
+	sethi		%hi(function_trace_stop), %g1
+	lduw		[%g1 + %lo(function_trace_stop)], %g2
+	brnz,pn		%g2, 1f
+	 sethi		%hi(ftrace_trace_function), %g1
 	sethi		%hi(ftrace_stub), %g2
 	ldx		[%g1 + %lo(ftrace_trace_function)], %g1
 ...
[ message continues ]
Previous thread: sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86. by Linux Kernel Mailing List on Tuesday, April 13, 2010 - 12:59 pm. (1 message)

Next thread: sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs. by Linux Kernel Mailing List on Tuesday, April 13, 2010 - 12:59 pm. (1 message)