summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/hardirq.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-i386/hardirq.h')
-rw-r--r--include/asm-i386/hardirq.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/asm-i386/hardirq.h b/include/asm-i386/hardirq.h
index f96faa806..4679cb3ef 100644
--- a/include/asm-i386/hardirq.h
+++ b/include/asm-i386/hardirq.h
@@ -17,8 +17,8 @@ extern unsigned int local_irq_count[NR_CPUS];
#define hardirq_trylock(cpu) (local_irq_count[cpu] == 0)
#define hardirq_endlock(cpu) do { } while (0)
-#define hardirq_enter(cpu) (local_irq_count[cpu]++)
-#define hardirq_exit(cpu) (local_irq_count[cpu]--)
+#define irq_enter(cpu, irq) (local_irq_count[cpu]++)
+#define irq_exit(cpu, irq) (local_irq_count[cpu]--)
#define synchronize_irq() barrier()
@@ -39,13 +39,17 @@ static inline void release_irqlock(int cpu)
}
}
-static inline void hardirq_enter(int cpu)
+static inline void irq_enter(int cpu, int irq)
{
++local_irq_count[cpu];
atomic_inc(&global_irq_count);
+
+ while (test_bit(0,&global_irq_lock)) {
+ /* nothing */;
+ }
}
-static inline void hardirq_exit(int cpu)
+static inline void irq_exit(int cpu, int irq)
{
atomic_dec(&global_irq_count);
--local_irq_count[cpu];