[PATCH] sh: Annotate irq functions with "notrace"

[PATCH] sh: Annotate irq functions with "notrace"

[Matt Fleming]

Now that SH's irqflags functions are out of line it becomes necessary to
mark them as "notrace" so that we don't try to trace them.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
---
 arch/sh/kernel/irq_32.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sh/kernel/irq_32.c b/arch/sh/kernel/irq_32.c
index b98a694..e33ab15 100644
--- a/arch/sh/kernel/irq_32.c
+++ b/arch/sh/kernel/irq_32.c
@@ -10,7 +10,7 @@
 #include <linux/irqflags.h>
 #include <linux/module.h>
 
-void raw_local_irq_restore(unsigned long flags)
+void notrace raw_local_irq_restore(unsigned long flags)
 {
 	unsigned long __dummy0, __dummy1;
 
@@ -40,7 +40,7 @@ void raw_local_irq_restore(unsigned long flags)
 }
 EXPORT_SYMBOL(raw_local_irq_restore);
 
-unsigned long __raw_local_save_flags(void)
+unsigned long notrace __raw_local_save_flags(void)
 {
 	unsigned long flags;
 
-- 
1.6.2.5

Re: [PATCH] sh: Annotate irq functions with "notrace"

[Paul Mundt]

On Mon, Oct 26, 2009 at 10:19:49PM +0000, Matt Fleming wrote:
> Now that SH's irqflags functions are out of line it becomes necessary to
> mark them as "notrace" so that we don't try to trace them.
> 
> Signed-off-by: Matt Fleming <matt@console-pimps.org>

This applies for the _64 bits too, but I just did those by hand.

Applied, thanks.

Re: [PATCH] sh: Annotate irq functions with "notrace"

[Matt Fleming]

On Tue, Oct 27, 2009 at 07:38:23AM +0900, Paul Mundt wrote:
> On Mon, Oct 26, 2009 at 10:19:49PM +0000, Matt Fleming wrote:
> > Now that SH's irqflags functions are out of line it becomes necessary to
> > mark them as "notrace" so that we don't try to trace them.
> > 
> > Signed-off-by: Matt Fleming <matt@console-pimps.org>
> 
> This applies for the _64 bits too, but I just did those by hand.
> 
> Applied, thanks.

Ah, doh. I didn't realise that tracing worked for SUPERH64.

Re: [PATCH] sh: Annotate irq functions with "notrace"

[Paul Mundt]

On Mon, Oct 26, 2009 at 10:49:40PM +0000, Matt Fleming wrote:
> On Tue, Oct 27, 2009 at 07:38:23AM +0900, Paul Mundt wrote:
> > On Mon, Oct 26, 2009 at 10:19:49PM +0000, Matt Fleming wrote:
> > > Now that SH's irqflags functions are out of line it becomes necessary to
> > > mark them as "notrace" so that we don't try to trace them.
> > > 
> > > Signed-off-by: Matt Fleming <matt@console-pimps.org>
> > 
> > This applies for the _64 bits too, but I just did those by hand.
> > 
> > Applied, thanks.
> 
> Ah, doh. I didn't realise that tracing worked for SUPERH64.

It doesn't yet, but we like to do future proofing, especially when the
issue at hand is fresh in ones mind. Otherwise we run in to situations
where when a feature is finally carried over, all of the subtle fixes
that came along with it are long forgotten and much debugging ensues.

Also note that notrace in itself has more implications than simply
tracing, it explicitly disables instrumentation. So it also matters
in the mcount case. If it were only the function graph tracer that were
problematic (as in the case of __switch_to) we would use __notrace_funcgraph,
which is much more explicitly stated.