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

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

diff --git a/include/asm-v850/hardirq.h b/include/asm-v850/hardirq.h
index 974fc08..04e2012 100644 (file)
--- a/include/asm-v850/hardirq.h
+++ b/include/asm-v850/hardirq.h
@@ -1,14 +1,13 @@
 #ifndef __V850_HARDIRQ_H__
 #define __V850_HARDIRQ_H__
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/cache.h>
 
+#include <asm/irq.h>
+
 typedef struct {
        unsigned int __softirq_pending;
-       unsigned int __syscall_count;
-       struct task_struct * __ksoftirqd_task;
 } ____cacheline_aligned irq_cpustat_t;
 
 #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
@@ -24,13 +23,6 @@ typedef struct {
 # error HARDIRQ_BITS is too low!
 #endif
 
-#define irq_enter()            (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)
+void ack_bad_irq(unsigned int irq);
 
 #endif /* __V850_HARDIRQ_H__ */