summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2010-09-20 13:15:07 -0700
committerTony Luck <tony.luck@intel.com>2010-09-20 13:15:07 -0700
commit9f081ce5da2c8af297a0a7d15a57fb4beeed374b (patch)
tree9dd3c62bb7303106d0a817938af5f2f0f40424b0
parent43e3bf203456c4f06bdd6060426976ad2bed9081 (diff)
downloadop-kernel-dev-9f081ce5da2c8af297a0a7d15a57fb4beeed374b.zip
op-kernel-dev-9f081ce5da2c8af297a0a7d15a57fb4beeed374b.tar.gz
[IA64] Move local_softirq_pending() definition
Ugly #include dependencies. We need to have local_softirq_pending() defined before it gets used in <linux/interrupt.h>. But <asm/hardirq.h> provides the definition *after* this #include chain: <linux/irq.h> <asm/irq.h> <asm/hw_irq.h> <linux/interrupt.h> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/include/asm/hardirq.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/hardirq.h b/arch/ia64/include/asm/hardirq.h
index d514cd9..8fb7d33 100644
--- a/arch/ia64/include/asm/hardirq.h
+++ b/arch/ia64/include/asm/hardirq.h
@@ -6,12 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-#include <asm/processor.h>
-
/*
* No irq_cpustat_t for IA-64. The data is held in the per-CPU data structure.
*/
@@ -20,6 +14,11 @@
#define local_softirq_pending() (local_cpu_data->softirq_pending)
+#include <linux/threads.h>
+#include <linux/irq.h>
+
+#include <asm/processor.h>
+
extern void __iomem *ipi_base_addr;
void ack_bad_irq(unsigned int irq);
OpenPOWER on IntegriCloud