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. This patch only updates include/asm-generic/irqflags.h, but the only archs to use it is superH and unicore32. Cc: Thomas Gleixner Cc: Paul Mundt Cc: Guan Xuetao Signed-off-by: Steven Rostedt --- include/asm-generic/irqflags.h | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/asm-generic/irqflags.h b/include/asm-generic/irqflags.h index 1f40d002..092b27e 100644 --- a/include/asm-generic/irqflags.h +++ b/include/asm-generic/irqflags.h @@ -1,6 +1,8 @@ #ifndef __ASM_GENERIC_IRQFLAGS_H #define __ASM_GENERIC_IRQFLAGS_H +#include + /* * All architectures should implement at least the first two functions, * usually inline assembly will be the best way. @@ -22,7 +24,7 @@ void arch_local_irq_restore(unsigned long flags); /* get status and disable interrupts */ #ifndef arch_local_irq_save -static inline unsigned long arch_local_irq_save(void) +static inline notrace unsigned long arch_local_irq_save(void) { unsigned long flags; flags = arch_local_save_flags(); @@ -33,7 +35,7 @@ static inline unsigned long arch_local_irq_save(void) /* test flags */ #ifndef arch_irqs_disabled_flags -static inline int arch_irqs_disabled_flags(unsigned long flags) +static inline notrace int arch_irqs_disabled_flags(unsigned long flags) { return flags == ARCH_IRQ_DISABLED; } @@ -41,7 +43,7 @@ static inline int arch_irqs_disabled_flags(unsigned long flags) /* unconditionally enable interrupts */ #ifndef arch_local_irq_enable -static inline void arch_local_irq_enable(void) +static inline notrace void arch_local_irq_enable(void) { arch_local_irq_restore(ARCH_IRQ_ENABLED); } @@ -49,7 +51,7 @@ static inline void arch_local_irq_enable(void) /* unconditionally disable interrupts */ #ifndef arch_local_irq_disable -static inline void arch_local_irq_disable(void) +static inline notrace void arch_local_irq_disable(void) { arch_local_irq_restore(ARCH_IRQ_DISABLED); } @@ -57,7 +59,7 @@ static inline void arch_local_irq_disable(void) /* test hardware interrupt enable bit */ #ifndef arch_irqs_disabled -static inline int arch_irqs_disabled(void) +static inline notrace int arch_irqs_disabled(void) { return arch_irqs_disabled_flags(arch_local_save_flags()); } -- 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/