From 377c968fbefed67b21bb59070f056b2194c201d1 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 25 Jan 2012 20:18:55 -0500
Subject: [PATCH] --- yaml --- r: 288671 b: refs/heads/master c:
 f069686e4bdc60a637d210ea3eea25fcdb82df88 h: refs/heads/master i:   288669:
 738ade8d75fae7d702bf76e6b6991f6abd553988   288667:
 7010c18b4a984a3d0ebfe9707f8eddd37bbe3ec9   288663:
 9880970ce05033233c3b92c32f494c4ed35195bd   288655:
 2ba79f114dfa0630f43889f409161d39a0ffa242   288639:
 04077cd75932a81bcf262cfe98fa59d57042d2d3 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/interrupt.h | 7 +------
 trunk/kernel/irq/chip.c         | 2 ++
 trunk/kernel/softirq.c          | 6 ++++++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ae61c7001bbe..f0be4730389f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac483c446b67870444c9eeaf8325d3d2af9b91bc
+refs/heads/master: f069686e4bdc60a637d210ea3eea25fcdb82df88
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index a64b00e286f5..3f830e005118 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -20,7 +20,6 @@
 #include <linux/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
-#include <trace/events/irq.h>
 
 /*
  * These correspond to the IORESOURCE_IRQ_* defines in
@@ -456,11 +455,7 @@ asmlinkage void do_softirq(void);
 asmlinkage void __do_softirq(void);
 extern void open_softirq(int nr, void (*action)(struct softirq_action *));
 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(unsigned int nr);
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index f7c543a801d9..fc418249f01f 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -16,6 +16,8 @@
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 
+#include <trace/events/irq.h>
+
 #include "internals.h"
 
 /**
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 4eb3a0fa351e..06d40993594a 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -385,6 +385,12 @@ void raise_softirq(unsigned int nr)
 	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 *))
 {
 	softirq_vec[nr].action = action;