diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-09-20 20:15:07 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-19 11:31:11 (GMT) |
| commit | 3c4ea5b4985ecf831e22034d5d5db6e6391f3911 (patch) | |
| tree | 233d81ab88885b003c40fd1968f77a9d8318fac6 /arch/ia64 | |
| parent | 57fa7214330be2e292ddb1402834ff0b221ef29a (diff) | |
| download | linux-3c4ea5b4985ecf831e22034d5d5db6e6391f3911.tar.xz | |
[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>
[ cherry-picked from the ia64 tree to fix "2bf2160: irq: Add tracepoint to softirq_raise" ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/hardirq.h | 11 |
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); |