Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / asm-m32r / hardirq.h

diff --git a/include/asm-m32r/hardirq.h b/include/asm-m32r/hardirq.h
index 78cb4c9..cb8aa76 100644 (file)
--- a/include/asm-m32r/hardirq.h
+++ b/include/asm-m32r/hardirq.h
@@ -1,14 +1,12 @@
+#ifdef __KERNEL__
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/irq.h>
 
 typedef struct {
        unsigned int __softirq_pending;
-       unsigned int __syscall_count;
-       struct task_struct * __ksoftirqd_task; /* waitqueue is too large */
 } ____cacheline_aligned irq_cpustat_t;
 
 #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
@@ -28,16 +26,11 @@ 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);
+       BUG();
+}
 
 #endif /* __ASM_HARDIRQ_H */
+#endif /* __KERNEL__ */