diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /include/asm-ppc/hardirq.h | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'include/asm-ppc/hardirq.h')
| -rw-r--r-- | include/asm-ppc/hardirq.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-ppc/hardirq.h b/include/asm-ppc/hardirq.h index cc0db7259..cb195c5f7 100644 --- a/include/asm-ppc/hardirq.h +++ b/include/asm-ppc/hardirq.h @@ -1,22 +1,22 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -extern unsigned int local_irq_count[NR_CPUS]; +extern unsigned int ppc_local_irq_count[NR_CPUS]; /* * 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); }) + (ppc_local_irq_count[__cpu] + ppc_local_bh_count[__cpu] != 0); }) #ifndef __SMP__ -#define hardirq_trylock(cpu) (local_irq_count[cpu] == 0) +#define hardirq_trylock(cpu) (ppc_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 hardirq_enter(cpu) (ppc_local_irq_count[cpu]++) +#define hardirq_exit(cpu) (ppc_local_irq_count[cpu]--) #define synchronize_irq() do { } while (0) @@ -39,14 +39,14 @@ static inline void release_irqlock(int cpu) static inline void hardirq_enter(int cpu) { - ++local_irq_count[cpu]; + ++ppc_local_irq_count[cpu]; atomic_inc(&global_irq_count); } static inline void hardirq_exit(int cpu) { atomic_dec(&global_irq_count); - --local_irq_count[cpu]; + --ppc_local_irq_count[cpu]; } static inline int hardirq_trylock(int cpu) |