diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /include/asm-sh/softirq.h | |
parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'include/asm-sh/softirq.h')
-rw-r--r-- | include/asm-sh/softirq.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sh/softirq.h b/include/asm-sh/softirq.h index 66b0963a8..a1ff593fd 100644 --- a/include/asm-sh/softirq.h +++ b/include/asm-sh/softirq.h @@ -13,8 +13,7 @@ extern unsigned int local_bh_count[NR_CPUS]; #define local_bh_enable() cpu_bh_enable(smp_processor_id()) #define get_active_bhs() (bh_mask & bh_active) -/* XXX */ -#define clear_active_bhs(x) atomic_clear_mask((x),&bh_active) +#define clear_active_bhs(x) atomic_clear_mask((x),(atomic_t *)&bh_active) extern inline void init_bh(int nr, void (*routine)(void)) { |