[PATCH] m32r: Use generic hardirq framework

This patch is for employing the generic hardirq framework for m32r.
Now CONFIG_GENERIC_HARDIRQS is set to Y by default.

  - Update to use GENERIC_HARDIRQ framework. 
  - Fix PREEMPT_ACTIVE definition (changeset 1.2000.16.20)
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>

arch/m32r/Kconfig

@@ -20,9 +20,13 @@ config GENERIC_ISA_DMA
 	bool
 	default y
 
-#config GENERIC_HARDIRQS
-#	bool
-#	default y
+config GENERIC_HARDIRQS
+	bool
+	default y
+
+config GENERIC_IRQ_PROBE
+	bool
+	default y
 
 source "init/Kconfig"
 

include/asm-m32r/hardirq.h

+#ifdef __KERNEL__
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
@@ -40,4 +41,11 @@ do {									\
 		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);
+	BUG();
+}
+
 #endif /* __ASM_HARDIRQ_H */
+#endif /* __KERNEL__ */

include/asm-m32r/irq.h

+#ifdef __KERNEL__
 #ifndef _ASM_M32R_IRQ_H
 #define _ASM_M32R_IRQ_H
 
-/* $Id$ */
-
 #include <linux/config.h>
 
 #if defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_USRV)
@@ -72,15 +71,5 @@
 
 #define irq_canonicalize(irq)	(irq)
 
-#ifndef __ASSEMBLY__
-extern void disable_irq(unsigned int);
-extern void disable_irq_nosync(unsigned int);
-extern void enable_irq(unsigned int);
-
-struct irqaction;
-struct pt_regs;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
-#endif
-
-#endif	/* _ASM_M32R_IRQ_H */
-
+#endif /* _ASM_M32R_IRQ_H */
+#endif /* __KERNEL__ */

include/asm-m32r/thread_info.h

@@ -53,7 +53,7 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE		0x4000000
+#define PREEMPT_ACTIVE		0x10000000
 
 /*
  * macros/functions for gaining access to the thread information structure