From: Steven Rostedt 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. Cc: Tony Luck Cc: Fenghua Yu Signed-off-by: Steven Rostedt --- arch/ia64/include/asm/irqflags.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h index f82d6be..82d4c5e 100644 --- a/arch/ia64/include/asm/irqflags.h +++ b/arch/ia64/include/asm/irqflags.h @@ -12,7 +12,7 @@ #ifdef CONFIG_IA64_DEBUG_IRQ extern unsigned long last_cli_ip; -static inline void arch_maybe_save_ip(unsigned long flags) +static inline notrace void arch_maybe_save_ip(unsigned long flags) { if (flags & IA64_PSR_I) last_cli_ip = ia64_getreg(_IA64_REG_IP); @@ -29,7 +29,7 @@ static inline void arch_maybe_save_ip(unsigned long flags) * and that writes to PSR.mfl */ -static inline unsigned long arch_local_save_flags(void) +static inline notrace unsigned long arch_local_save_flags(void) { ia64_stop(); #ifdef CONFIG_PARAVIRT @@ -39,7 +39,7 @@ static inline unsigned long arch_local_save_flags(void) #endif } -static inline unsigned long arch_local_irq_save(void) +static inline notrace unsigned long arch_local_irq_save(void) { unsigned long flags = arch_local_save_flags(); @@ -49,7 +49,7 @@ static inline unsigned long arch_local_irq_save(void) return flags; } -static inline void arch_local_irq_disable(void) +static inline notrace void arch_local_irq_disable(void) { #ifdef CONFIG_IA64_DEBUG_IRQ arch_local_irq_save(); @@ -59,14 +59,14 @@ static inline void arch_local_irq_disable(void) #endif } -static inline void arch_local_irq_enable(void) +static inline notrace void arch_local_irq_enable(void) { ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); } -static inline void arch_local_irq_restore(unsigned long flags) +static inline notrace void arch_local_irq_restore(unsigned long flags) { #ifdef CONFIG_IA64_DEBUG_IRQ unsigned long old_psr = arch_local_save_flags(); @@ -75,17 +75,17 @@ static inline void arch_local_irq_restore(unsigned long flags) arch_maybe_save_ip(old_psr & ~flags); } -static inline bool arch_irqs_disabled_flags(unsigned long flags) +static inline notrace bool arch_irqs_disabled_flags(unsigned long flags) { return (flags & IA64_PSR_I) == 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()); } -static inline void arch_safe_halt(void) +static inline notrace void arch_safe_halt(void) { ia64_pal_halt_light(); /* PAL_HALT_LIGHT */ } -- 1.7.5.4 -- 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/