Browse Source

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: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt 13 years ago
parent
commit
f069686e4b
3 changed files with 9 additions and 6 deletions
  1. 1 6
      include/linux/interrupt.h
  2. 2 0
      kernel/irq/chip.c
  3. 6 0
      kernel/softirq.c

+ 1 - 6
include/linux/interrupt.h

@@ -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)
-{
-	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_irqoff(unsigned int nr);
 extern void raise_softirq(unsigned int nr);
 extern void raise_softirq(unsigned int nr);

+ 2 - 0
kernel/irq/chip.c

@@ -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"
 
 
 /**
 /**

+ 6 - 0
kernel/softirq.c

@@ -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;