diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-m68k/softirq.h | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-m68k/softirq.h')
| -rw-r--r-- | include/asm-m68k/softirq.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/asm-m68k/softirq.h b/include/asm-m68k/softirq.h index 89a3e3971..3a346780b 100644 --- a/include/asm-m68k/softirq.h +++ b/include/asm-m68k/softirq.h @@ -7,14 +7,12 @@ #include <asm/atomic.h> -#define local_bh_disable() (local_bh_count(smp_processor_id())++) -#define local_bh_enable() (local_bh_count(smp_processor_id())--) +#define cpu_bh_disable(cpu) do { local_bh_count(cpu)++; barrier(); } while (0) +#define cpu_bh_enable(cpu) do { barrier(); local_bh_count(cpu)--; } while (0) -#define in_softirq() (local_bh_count != 0) +#define local_bh_disable() cpu_bh_disable(smp_processor_id()) +#define local_bh_enable() cpu_bh_enable(smp_processor_id()) -/* 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 synchronize_bh() barrier() +#define in_softirq() (local_bh_count(smp_processor_id()) != 0) #endif |