diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:38:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:38:26 -0800 |
| commit | 0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01 (patch) | |
| tree | 6e13ef4d7247e53d7a0f18e04549a8847cc80214 /include | |
| parent | cfd74486eace27a0899b30529d01bc1a09a5b973 (diff) | |
| parent | dfff95c394b0dd977a6b65bd52b99703fae94d9b (diff) | |
| download | linux-3.10-0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01.tar.gz linux-3.10-0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01.tar.bz2 linux-3.10-0f5c2ac58f22fd41deaeeb45ee752d4ae55f0d01.zip | |
Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
um: Use generic irq Kconfig
tile: Use generic irq Kconfig
sparc: Use generic irq Kconfig
score: Use generic irq Kconfig
powerpc: Use generic irq Kconfig
parisc: Use generic irq Kconfig
mn10300: Use generic irq Kconfig
microblaze: Use generic irq Kconfig
m68knommu: Use generic irq Kconfig
ia64: Use generic irq Kconfig
frv: Use generic irq Kconfig
blackfin: Use generic irq Kconfig
alpha: Use generic irq Kconfig
genirq: Remove __do_IRQ
m32r: Convert to generic irq Kconfig
m32r: Convert usrv platform irq handling
m32r: Convert opsput_lcdpld irq chip
m32r: Convert opsput lanpld irq chip
m32r: Convert opsput pld irq chip
m32r: Convert opsput irq chip
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqdesc.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index 6a64c6fa81a..c1a95b7b58d 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -101,13 +101,6 @@ static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node) #define get_irq_desc_msi(desc) ((desc)->irq_data.msi_desc) /* - * Monolithic do_IRQ implementation. - */ -#ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ -extern unsigned int __do_IRQ(unsigned int irq); -#endif - -/* * Architectures call this to let the generic IRQ layer * handle an interrupt. If the descriptor is attached to an * irqchip-style controller then we call the ->handle_irq() handler, @@ -115,14 +108,7 @@ extern unsigned int __do_IRQ(unsigned int irq); */ static inline void generic_handle_irq_desc(unsigned int irq, struct irq_desc *desc) { -#ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ desc->handle_irq(irq, desc); -#else - if (likely(desc->handle_irq)) - desc->handle_irq(irq, desc); - else - __do_IRQ(irq); -#endif } static inline void generic_handle_irq(unsigned int irq) |