diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 16:57:17 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 16:57:17 (GMT) |
commit | 4dc8ab86e0724642e2f778116de64f4b832d7d94 (patch) | |
tree | ba3e1327823ac94dc5d33cb76d8704ea0ad915d7 /include/asm-m32r/hardirq.h | |
parent | b9836e08375d86834edcde45e3628e63db8b9624 (diff) | |
parent | 78a49990269a539fc77e9a669d9e74e1dfaec657 (diff) | |
download | linux-fsl-qoriq-4dc8ab86e0724642e2f778116de64f4b832d7d94.tar.xz |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: move include/asm-m32r/* to arch/m32r/include/asm/
m32r: move include/asm-m32r headers to arch/m32r/include/asm
Diffstat (limited to 'include/asm-m32r/hardirq.h')
-rw-r--r-- | include/asm-m32r/hardirq.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/include/asm-m32r/hardirq.h b/include/asm-m32r/hardirq.h deleted file mode 100644 index cb8aa76..0000000 --- a/include/asm-m32r/hardirq.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifdef __KERNEL__ -#ifndef __ASM_HARDIRQ_H -#define __ASM_HARDIRQ_H - -#include <linux/threads.h> -#include <linux/irq.h> - -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ - -#if NR_IRQS > 256 -#define HARDIRQ_BITS 9 -#else -#define HARDIRQ_BITS 8 -#endif - -/* - * The hardirq mask has to be large enough to have - * space for potentially all IRQ sources in the system - * nesting on a single CPU: - */ -#if (1 << HARDIRQ_BITS) < NR_IRQS -# error HARDIRQ_BITS is too low! -#endif - -static inline void ack_bad_irq(int irq) -{ - printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq); - BUG(); -} - -#endif /* __ASM_HARDIRQ_H */ -#endif /* __KERNEL__ */ |