summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHirokazu Takata <takata@linux-m32r.org>2005-01-07 21:37:43 -0800
committerLinus Torvalds <torvalds@evo.osdl.org>2005-01-07 21:37:43 -0800
commit157e5929111fbd29ec1731d4cf4787bb7200091b (patch)
tree66a3654df8a3113c04fac8f6dd728d1b91c900ce /include
parente219115e8ffcdfed80f72f32143d90337ca10b13 (diff)
[PATCH] m32r: build fix
This patch is required to fix compile errors for m32r. This was originally given by the following patch: [PATCH] move irq_enter and irq_exit to common code http://www.ussg.iu.edu/hypermail/linux/kernel/0411.1/1738.html I think it was maybe accidentally dropped only for the m32r arch due to a patching conflict with the other patches or something like that. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-m32r/hardirq.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-m32r/hardirq.h b/include/asm-m32r/hardirq.h
index a89dbc156ca6..5da830ec1587 100644
--- a/include/asm-m32r/hardirq.h
+++ b/include/asm-m32r/hardirq.h
@@ -27,18 +27,6 @@ typedef struct {
# error HARDIRQ_BITS is too low!
#endif
-#define irq_enter() (preempt_count() += HARDIRQ_OFFSET)
-#define nmi_enter() (irq_enter())
-#define nmi_exit() (preempt_count() -= HARDIRQ_OFFSET)
-
-#define irq_exit() \
-do { \
- preempt_count() -= IRQ_EXIT_OFFSET; \
- if (!in_interrupt() && softirq_pending(smp_processor_id())) \
- do_softirq(); \
- preempt_enable_no_resched(); \
-} while (0)
-
static inline void ack_bad_irq(int irq)
{
printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);