summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-16 19:53:37 +0200
committerMike Frysinger <vapier@gentoo.org>2009-07-16 19:56:07 +0200
commit6843f405da9d0adf734d8f695311e29cc92a220c (patch)
tree26bf79b8171d35e24a6809152392f159b76d9b06 /arch
parentarch/blackfin: Add kmalloc NULL tests (diff)
downloadlinux-6843f405da9d0adf734d8f695311e29cc92a220c.tar.xz
linux-6843f405da9d0adf734d8f695311e29cc92a220c.zip
Blackfin: define HARDIRQ_BITS again for now
The default values of HARDIRQ_BITS and PREEMPT_BITS in common code leads to build failure: In file included from include/linux/interrupt.h:12, from include/linux/kernel_stat.h:8, from arch/blackfin/kernel/asm-offsets.c:32: include/linux/hardirq.h:66:2: error: #error PREEMPT_ACTIVE is too low! So until that gets resolved, just declare our own default value again. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/include/asm/hardirq.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/hardirq.h b/arch/blackfin/include/asm/hardirq.h
index cbd52f86bb9f..0b78b873df51 100644
--- a/arch/blackfin/include/asm/hardirq.h
+++ b/arch/blackfin/include/asm/hardirq.h
@@ -6,6 +6,9 @@
extern void ack_bad_irq(unsigned int irq);
#define ack_bad_irq ack_bad_irq
+/* Define until common code gets sane defaults */
+#define HARDIRQ_BITS 9
+
#include <asm-generic/hardirq.h>
#endif