diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /include/asm-sh/hardirq.h | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'include/asm-sh/hardirq.h')
| -rw-r--r-- | include/asm-sh/hardirq.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/asm-sh/hardirq.h b/include/asm-sh/hardirq.h index e57d0e31a..592b31d95 100644 --- a/include/asm-sh/hardirq.h +++ b/include/asm-sh/hardirq.h @@ -4,25 +4,28 @@ #include <linux/config.h> #include <linux/threads.h> -extern unsigned int local_irq_count[NR_CPUS]; -extern unsigned int local_bh_count[NR_CPUS]; +extern unsigned int __local_irq_count[NR_CPUS]; +extern unsigned int __local_bh_count[NR_CPUS]; + +#define local_irq_count(cpu) (__local_irq_count[(cpu)]) +#define local_bh_count(cpu) (__local_bh_count[(cpu)]) /* * Are we in an interrupt context? Either doing bottom half * or hardware interrupt processing? */ #define in_interrupt() ({ int __cpu = smp_processor_id(); \ - (local_irq_count[__cpu] + local_bh_count[__cpu] != 0); }) + (__local_irq_count[__cpu] + __local_bh_count[__cpu] != 0); }) -#define in_irq() (local_irq_count[smp_processor_id()] != 0) +#define in_irq() (__local_irq_count[smp_processor_id()] != 0) #ifndef CONFIG_SMP -#define hardirq_trylock(cpu) (local_irq_count[cpu] == 0) +#define hardirq_trylock(cpu) (__local_irq_count[cpu] == 0) #define hardirq_endlock(cpu) do { } while (0) -#define irq_enter(cpu, irq) (local_irq_count[cpu]++) -#define irq_exit(cpu, irq) (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() |