diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 11:34:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 11:34:24 -0700 |
| commit | defe9104833b5ad309447bbc1fcb8e5981b2d3e1 (patch) | |
| tree | c399f17f5b2dfacbf6df399dd1df8b15c7573fbe /include/asm-generic/hardirq.h | |
| parent | 95b3692d9c22c659312acb466d0608bf8509f296 (diff) | |
| parent | 0634a632f5dea8281ae7c9a96800582ff9eb1475 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: add dummy pgprot_noncached()
lib/checksum.c: fix endianess bug
asm-generic: hook up new system calls
asm-generic: list Arnd as asm-generic maintainer
asm-generic: drop HARDIRQ_BITS definition from hardirq.h
asm-generic: uaccess: fix up local access_ok() usage
asm-generic: uaccess: add missing access_ok() check to strnlen_user()
Diffstat (limited to 'include/asm-generic/hardirq.h')
| -rw-r--r-- | include/asm-generic/hardirq.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asm-generic/hardirq.h b/include/asm-generic/hardirq.h index 3d5d2c906ab3..23bb4dad4962 100644 --- a/include/asm-generic/hardirq.h +++ b/include/asm-generic/hardirq.h @@ -11,19 +11,6 @@ typedef struct { #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ -#ifndef HARDIRQ_BITS -#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 - #ifndef ack_bad_irq static inline void ack_bad_irq(unsigned int irq) { |