Skip to content

Commit

Permalink
sparc/irqs: Do not trace arch_local_{*,irq_*} functions
Browse files Browse the repository at this point in the history
Do not trace arch_local_save_flags(), arch_local_irq_*() and friends.
Although they are marked inline, gcc may still make a function out of
them and add it to the pool of functions that are traced by the function
tracer. This can cause undesirable results (kernel panic, triple faults,
etc).

Add the notrace notation to prevent them from ever being traced.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Steven Rostedt authored and David S. Miller committed Jul 6, 2011
1 parent a2fa83f commit 18d85bc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions arch/sparc/include/asm/irqflags_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ extern void arch_local_irq_restore(unsigned long);
extern unsigned long arch_local_irq_save(void);
extern void arch_local_irq_enable(void);

static inline unsigned long arch_local_save_flags(void)
static inline notrace unsigned long arch_local_save_flags(void)
{
unsigned long flags;

asm volatile("rd %%psr, %0" : "=r" (flags));
return flags;
}

static inline void arch_local_irq_disable(void)
static inline notrace void arch_local_irq_disable(void)
{
arch_local_irq_save();
}

static inline bool arch_irqs_disabled_flags(unsigned long flags)
static inline notrace bool arch_irqs_disabled_flags(unsigned long flags)
{
return (flags & PSR_PIL) != 0;
}

static inline bool arch_irqs_disabled(void)
static inline notrace bool arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}
Expand Down
14 changes: 7 additions & 7 deletions arch/sparc/include/asm/irqflags_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#ifndef __ASSEMBLY__

static inline unsigned long arch_local_save_flags(void)
static inline notrace unsigned long arch_local_save_flags(void)
{
unsigned long flags;

Expand All @@ -26,7 +26,7 @@ static inline unsigned long arch_local_save_flags(void)
return flags;
}

static inline void arch_local_irq_restore(unsigned long flags)
static inline notrace void arch_local_irq_restore(unsigned long flags)
{
__asm__ __volatile__(
"wrpr %0, %%pil"
Expand All @@ -36,7 +36,7 @@ static inline void arch_local_irq_restore(unsigned long flags)
);
}

static inline void arch_local_irq_disable(void)
static inline notrace void arch_local_irq_disable(void)
{
__asm__ __volatile__(
"wrpr %0, %%pil"
Expand All @@ -46,7 +46,7 @@ static inline void arch_local_irq_disable(void)
);
}

static inline void arch_local_irq_enable(void)
static inline notrace void arch_local_irq_enable(void)
{
__asm__ __volatile__(
"wrpr 0, %%pil"
Expand All @@ -56,17 +56,17 @@ static inline void arch_local_irq_enable(void)
);
}

static inline int arch_irqs_disabled_flags(unsigned long flags)
static inline notrace int arch_irqs_disabled_flags(unsigned long flags)
{
return (flags > 0);
}

static inline int arch_irqs_disabled(void)
static inline notrace int arch_irqs_disabled(void)
{
return arch_irqs_disabled_flags(arch_local_save_flags());
}

static inline unsigned long arch_local_irq_save(void)
static inline notrace unsigned long arch_local_irq_save(void)
{
unsigned long flags, tmp;

Expand Down

0 comments on commit 18d85bc

Please sign in to comment.