Skip to content

Commit

Permalink
Blackfin: 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: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
Steven Rostedt authored and Mike Frysinger committed Jul 23, 2011
1 parent b0d3dc1 commit a2de3f7
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions arch/blackfin/include/asm/irqflags.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
extern unsigned long bfin_irq_flags;
#endif

static inline void bfin_sti(unsigned long flags)
static inline notrace void bfin_sti(unsigned long flags)
{
asm volatile("sti %0;" : : "d" (flags));
}

static inline unsigned long bfin_cli(void)
static inline notrace unsigned long bfin_cli(void)
{
unsigned long flags;
asm volatile("cli %0;" : "=d" (flags));
Expand All @@ -40,22 +40,22 @@ static inline unsigned long bfin_cli(void)
/*
* Hard, untraced CPU interrupt flag manipulation and access.
*/
static inline void __hard_local_irq_disable(void)
static inline notrace void __hard_local_irq_disable(void)
{
bfin_cli();
}

static inline void __hard_local_irq_enable(void)
static inline notrace void __hard_local_irq_enable(void)
{
bfin_sti(bfin_irq_flags);
}

static inline unsigned long hard_local_save_flags(void)
static inline notrace unsigned long hard_local_save_flags(void)
{
return bfin_read_IMASK();
}

static inline unsigned long __hard_local_irq_save(void)
static inline notrace unsigned long __hard_local_irq_save(void)
{
unsigned long flags;
flags = bfin_cli();
Expand All @@ -65,18 +65,18 @@ static inline unsigned long __hard_local_irq_save(void)
return flags;
}

static inline int hard_irqs_disabled_flags(unsigned long flags)
static inline notrace int hard_irqs_disabled_flags(unsigned long flags)
{
return (flags & ~0x3f) == 0;
}

static inline int hard_irqs_disabled(void)
static inline notrace int hard_irqs_disabled(void)
{
unsigned long flags = hard_local_save_flags();
return hard_irqs_disabled_flags(flags);
}

static inline void __hard_local_irq_restore(unsigned long flags)
static inline notrace void __hard_local_irq_restore(unsigned long flags)
{
if (!hard_irqs_disabled_flags(flags))
__hard_local_irq_enable();
Expand Down Expand Up @@ -113,31 +113,31 @@ void ipipe_check_context(struct ipipe_domain *ipd);
/*
* Interrupt pipe interface to linux/irqflags.h.
*/
static inline void arch_local_irq_disable(void)
static inline notrace void arch_local_irq_disable(void)
{
__check_irqop_context();
__ipipe_stall_root();
barrier();
}

static inline void arch_local_irq_enable(void)
static inline notrace void arch_local_irq_enable(void)
{
barrier();
__check_irqop_context();
__ipipe_unstall_root();
}

static inline unsigned long arch_local_save_flags(void)
static inline notrace unsigned long arch_local_save_flags(void)
{
return __ipipe_test_root() ? bfin_no_irqs : bfin_irq_flags;
}

static inline int arch_irqs_disabled_flags(unsigned long flags)
static inline notrace int arch_irqs_disabled_flags(unsigned long flags)
{
return flags == bfin_no_irqs;
}

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

Expand All @@ -148,13 +148,13 @@ static inline unsigned long arch_local_irq_save(void)
return flags;
}

static inline void arch_local_irq_restore(unsigned long flags)
static inline notrace void arch_local_irq_restore(unsigned long flags)
{
__check_irqop_context();
__ipipe_restore_root(flags == bfin_no_irqs);
}

static inline unsigned long arch_mangle_irq_bits(int virt, unsigned long real)
static inline notrace unsigned long arch_mangle_irq_bits(int virt, unsigned long real)
{
/*
* Merge virtual and real interrupt mask bits into a single
Expand All @@ -163,7 +163,7 @@ static inline unsigned long arch_mangle_irq_bits(int virt, unsigned long real)
return (real & ~(1 << 31)) | ((virt != 0) << 31);
}

static inline int arch_demangle_irq_bits(unsigned long *x)
static inline notrace int arch_demangle_irq_bits(unsigned long *x)
{
int virt = (*x & (1 << 31)) != 0;
*x &= ~(1L << 31);
Expand All @@ -174,23 +174,23 @@ static inline int arch_demangle_irq_bits(unsigned long *x)
* Interface to various arch routines that may be traced.
*/
#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
static inline void hard_local_irq_disable(void)
static inline notrace void hard_local_irq_disable(void)
{
if (!hard_irqs_disabled()) {
__hard_local_irq_disable();
ipipe_trace_begin(0x80000000);
}
}

static inline void hard_local_irq_enable(void)
static inline notrace void hard_local_irq_enable(void)
{
if (hard_irqs_disabled()) {
ipipe_trace_end(0x80000000);
__hard_local_irq_enable();
}
}

static inline unsigned long hard_local_irq_save(void)
static inline notrace unsigned long hard_local_irq_save(void)
{
unsigned long flags = hard_local_save_flags();
if (!hard_irqs_disabled_flags(flags)) {
Expand All @@ -200,7 +200,7 @@ static inline unsigned long hard_local_irq_save(void)
return flags;
}

static inline void hard_local_irq_restore(unsigned long flags)
static inline notrace void hard_local_irq_restore(unsigned long flags)
{
if (!hard_irqs_disabled_flags(flags)) {
ipipe_trace_end(0x80000001);
Expand Down

0 comments on commit a2de3f7

Please sign in to comment.