From 5514f4babeeb3af00ee0c325e3cda7a562cc3d65 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 8 Aug 2000 18:54:49 +0000 Subject: Merge with Linux 2.4.0-test6-pre4. --- include/asm-sparc/irq.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/asm-sparc/irq.h') diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index 5859d82e9..4b6dd0dae 100644 --- a/include/asm-sparc/irq.h +++ b/include/asm-sparc/irq.h @@ -23,16 +23,14 @@ BTFIXUPDEF_CALL(char *, __irq_itoa, unsigned int) /* IRQ handler dispatch entry and exit. */ #ifdef CONFIG_SMP -extern unsigned int __local_irq_count[NR_CPUS]; #define irq_enter(cpu, irq) \ do { hardirq_enter(cpu); \ spin_unlock_wait(&global_irq_lock); \ } while(0) #define irq_exit(cpu, irq) hardirq_exit(cpu) #else -extern unsigned int __local_irq_count; -#define irq_enter(cpu, irq) (__local_irq_count++) -#define irq_exit(cpu, irq) (__local_irq_count--) +#define irq_enter(cpu, irq) (++local_irq_count(cpu)) +#define irq_exit(cpu, irq) (--local_irq_count(cpu)) #endif /* Dave Redman (djhr@tadpole.co.uk) -- cgit v1.2.3