diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 13:20:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 13:20:42 -0700 |
| commit | 12a499612e1ff439bdad240c7f86c55366941d4d (patch) | |
| tree | 9fd218631e0c8c26a5ffc41ebce1d65f8e826339 /include/linux | |
| parent | eee2775d9924b22643bd89b2e568cc5eed7e8a04 (diff) | |
| parent | 70590ea75b7f9ef4846b0b0f4400e8338dbcc7eb (diff) | |
| download | linux-3.10-12a499612e1ff439bdad240c7f86c55366941d4d.tar.gz linux-3.10-12a499612e1ff439bdad240c7f86c55366941d4d.tar.bz2 linux-3.10-12a499612e1ff439bdad240c7f86c55366941d4d.zip | |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
pci/intr_remapping: Allocate irq_iommu on node
irq: Add irq_node() primitive
irq: Make sure irq_desc for legacy irq get correct node setting
genirq: Add prototype for handle_nested_irq()
irq: Remove superfluous NULL pointer check in check_irq_resend()
irq: Clean up by removing irqfixup MODULE_PARM_DESC()
genirq: Fix comment describing suspend_device_irqs()
genirq: Remove obsolete defines and typedefs
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irq.h | 8 | ||||
| -rw-r--r-- | include/linux/irqnr.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index cb2e77a3f7f..9e9eb76faf8 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -220,13 +220,6 @@ static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node) extern struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node); /* - * Migration helpers for obsolete names, they will go away: - */ -#define hw_interrupt_type irq_chip -#define no_irq_type no_irq_chip -typedef struct irq_desc irq_desc_t; - -/* * Pick up the arch-dependent methods: */ #include <asm/hw_irq.h> @@ -289,6 +282,7 @@ extern void handle_edge_irq(unsigned int irq, struct irq_desc *desc); extern void handle_simple_irq(unsigned int irq, struct irq_desc *desc); extern void handle_percpu_irq(unsigned int irq, struct irq_desc *desc); extern void handle_bad_irq(unsigned int irq, struct irq_desc *desc); +extern void handle_nested_irq(unsigned int irq); /* * Monolithic do_IRQ implementation. diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h index ec87b212ff7..7bf89bc8cbc 100644 --- a/include/linux/irqnr.h +++ b/include/linux/irqnr.h @@ -41,6 +41,12 @@ extern struct irq_desc *irq_to_desc(unsigned int irq); ; \ else +#ifdef CONFIG_SMP +#define irq_node(irq) (irq_to_desc(irq)->node) +#else +#define irq_node(irq) 0 +#endif + #endif /* CONFIG_GENERIC_HARDIRQS */ #define for_each_irq_nr(irq) \ |