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

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

diff --git a/include/asm-arm26/hardirq.h b/include/asm-arm26/hardirq.h
index bb5a5fa..e717742 100644 (file)
--- a/include/asm-arm26/hardirq.h
+++ b/include/asm-arm26/hardirq.h
@@ -1,16 +1,12 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/config.h>
 #include <linux/cache.h>
 #include <linux/threads.h>
+#include <asm/irq.h>
 
 typedef struct {
        unsigned int __softirq_pending;
-       unsigned int __local_irq_count;
-       unsigned int __local_bh_count;
-       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 */
@@ -26,17 +22,11 @@ typedef struct {
 # error HARDIRQ_BITS is too low!
 #endif
 
-#define irq_enter()            (preempt_count() += HARDIRQ_OFFSET)
-
 #ifndef CONFIG_SMP
-#define irq_exit()                                                     \
-       do {                                                            \
-               preempt_count() -= HARDIRQ_OFFSET;                      \
-               if (!in_interrupt() && softirq_pending(smp_processor_id())) \
-                       __asm__("bl%? __do_softirq": : : "lr");/* out of line */\
-               preempt_enable_no_resched();                            \
-       } while (0)
+
+extern asmlinkage void __do_softirq(void);
 
 #endif
 
+
 #endif /* __ASM_HARDIRQ_H */