diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:07:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:07:33 -0700 |
| commit | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch) | |
| tree | 03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /include/asm-m68knommu/hardirq.h | |
| parent | 4c514a5ad1314b872e3185dabaf105c81d39d7e8 (diff) | |
| parent | 58750139001bae11a1f9b074f3a9c774fecf5ba8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
Diffstat (limited to 'include/asm-m68knommu/hardirq.h')
| -rw-r--r-- | include/asm-m68knommu/hardirq.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-m68knommu/hardirq.h b/include/asm-m68knommu/hardirq.h deleted file mode 100644 index bfad28149a4..00000000000 --- a/include/asm-m68knommu/hardirq.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __M68K_HARDIRQ_H -#define __M68K_HARDIRQ_H - -#include <linux/cache.h> -#include <linux/threads.h> -#include <asm/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 */ - -#define HARDIRQ_BITS 8 - -/* - * 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 - -void ack_bad_irq(unsigned int irq); - -#endif /* __M68K_HARDIRQ_H */ |