Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18d85bc5 authored by Steven Rostedt's avatar Steven Rostedt Committed by David S. Miller
Browse files

sparc/irqs: Do not trace arch_local_{*,irq_*} functions 



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: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2fa83fa

arch/sparc/include/asm/irqflags_32.h

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 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;
@@ -26,17 +26,17 @@ static inline unsigned long arch_local_save_flags(void) 
	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());

}

arch/sparc/include/asm/irqflags_64.h

+7 −7
Original line number Diff line number Diff line
@@ -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;
@@ -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"
@@ -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"
@@ -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"
@@ -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;