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

Commit f069686e authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing/softirq: Move __raise_softirq_irqoff() out of header 

The __raise_softirq_irqoff() contains a tracepoint. As tracepoints in headers
can cause issues, and not to mention, bloats the kernel when they are
in a static inline, it is best to move the function that contains the
tracepoint out of the header and into softirq.c.

Link: http://lkml.kernel.org/r/20120118120711.GB14863@elte.hu



Suggested-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent ac483c44

include/linux/interrupt.h

+1 −6
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/atomic.h>

#include <linux/atomic.h>

#include <asm/ptrace.h>

#include <asm/ptrace.h>

#include <asm/system.h>

#include <asm/system.h>

#include <trace/events/irq.h>





/*

/*

 * These correspond to the IORESOURCE_IRQ_* defines in

 * These correspond to the IORESOURCE_IRQ_* defines in
@@ -456,11 +455,7 @@ asmlinkage void do_softirq(void); 
asmlinkage void __do_softirq(void);

asmlinkage void __do_softirq(void);

extern void open_softirq(int nr, void (*action)(struct softirq_action *));

extern void open_softirq(int nr, void (*action)(struct softirq_action *));

extern void softirq_init(void);

extern void softirq_init(void);

static inline void __raise_softirq_irqoff(unsigned int nr)

extern void __raise_softirq_irqoff(unsigned int nr);

{

	trace_softirq_raise(nr);

	or_softirq_pending(1UL << nr);

}





extern void raise_softirq_irqoff(unsigned int nr);

extern void raise_softirq_irqoff(unsigned int nr);

extern void raise_softirq(unsigned int nr);

extern void raise_softirq(unsigned int nr);

kernel/irq/chip.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/kernel_stat.h>

#include <linux/kernel_stat.h>





#include <trace/events/irq.h>



#include "internals.h"

#include "internals.h"





/**

/**

kernel/softirq.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -385,6 +385,12 @@ void raise_softirq(unsigned int nr) 
	local_irq_restore(flags);

	local_irq_restore(flags);

}

}





void __raise_softirq_irqoff(unsigned int nr)

{

	trace_softirq_raise(nr);

	or_softirq_pending(1UL << nr);

}



void open_softirq(int nr, void (*action)(struct softirq_action *))

void open_softirq(int nr, void (*action)(struct softirq_action *))

{

{

	softirq_vec[nr].action = action;

	softirq_vec[nr].action = action;