Skip to content

Commit

Permalink
[IA64] Move local_softirq_pending() definition
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Luck authored and Ingo Molnar committed Oct 19, 2010
1 parent 57fa721 commit 3c4ea5b
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions arch/ia64/include/asm/hardirq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand All @@ -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);
Expand Down

0 comments on commit 3c4ea5b

Please sign in to comment.