summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/softirq.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 18:54:49 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 18:54:49 +0000
commit5514f4babeeb3af00ee0c325e3cda7a562cc3d65 (patch)
treeedd733879cab73e41324a99ca5da7bc154c4196d /include/asm-m68k/softirq.h
parent6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff)
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'include/asm-m68k/softirq.h')
-rw-r--r--include/asm-m68k/softirq.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asm-m68k/softirq.h b/include/asm-m68k/softirq.h
index a51563cd7..89a3e3971 100644
--- a/include/asm-m68k/softirq.h
+++ b/include/asm-m68k/softirq.h
@@ -7,16 +7,14 @@
#include <asm/atomic.h>
-extern unsigned int local_bh_count[NR_CPUS];
-
-#define local_bh_disable() (local_bh_count[smp_processor_id()]++)
-#define local_bh_enable() (local_bh_count[smp_processor_id()]--)
+#define local_bh_disable() (local_bh_count(smp_processor_id())++)
+#define local_bh_enable() (local_bh_count(smp_processor_id())--)
#define in_softirq() (local_bh_count != 0)
/* These are for the irq's testing the lock */
-#define softirq_trylock(cpu) (local_bh_count[cpu] ? 0 : (local_bh_count[cpu]=1))
-#define softirq_endlock(cpu) (local_bh_count[cpu] = 0)
+#define softirq_trylock(cpu) (local_bh_count(cpu) ? 0 : (local_bh_count(cpu)=1))
+#define softirq_endlock(cpu) (local_bh_count(cpu) = 0)
#define synchronize_bh() barrier()
#endif