fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/asm-arm26/hardirq.h b/include/asm-arm26/hardirq.h
index 52feb95..e717742 100644 (file)
--- a/include/asm-arm26/hardirq.h
+++ b/include/asm-arm26/hardirq.h
@@ -1,37 +1,18 @@
 #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 */
 
-/*
- * We put the hardirq and softirq counter into the preemption
- * counter.  The bitmask has the following meaning:
- *
- * - bits 0-7 are the preemption count (max depth: 256)
- * - bits 8-15 are the softirq count (max # of softirqs: 256)
- * - bits 16-23 are the hardirq count (max # of hardirqs: 256)
- * - bit 26 is the PREEMPT_ACTIVE flag
- */
-#define PREEMPT_BITS   8
-#define SOFTIRQ_BITS   8
 #define HARDIRQ_BITS   8
 
-#define PREEMPT_SHIFT  0
-#define SOFTIRQ_SHIFT  (PREEMPT_SHIFT + PREEMPT_BITS)
-#define HARDIRQ_SHIFT  (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
-
 /*
  * The hardirq mask has to be large enough to have space
  * for potentially all IRQ sources in the system nesting
@@ -41,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 */