From ba2dacab305c598cd4c34a604f8e276bf5bab5ff Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 12 May 2000 21:05:59 +0000 Subject: Merge with Linux 2.3.99-pre7 and various other bits. --- include/asm-alpha/hardirq.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/asm-alpha/hardirq.h') diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h index 1c8101d58..3961ac4a4 100644 --- a/include/asm-alpha/hardirq.h +++ b/include/asm-alpha/hardirq.h @@ -3,9 +3,10 @@ /* Initially just a straight copy of the i386 code. */ +#include #include -#ifndef __SMP__ +#ifndef CONFIG_SMP extern int __local_irq_count; #define local_irq_count(cpu) ((void)(cpu), __local_irq_count) extern unsigned long __irq_attempt[]; @@ -28,7 +29,7 @@ extern unsigned long __irq_attempt[]; #define in_irq() (local_irq_count(smp_processor_id()) != 0) -#ifndef __SMP__ +#ifndef CONFIG_SMP #define hardirq_trylock(cpu) (local_irq_count(cpu) == 0) #define hardirq_endlock(cpu) ((void) 0) @@ -88,5 +89,5 @@ static inline int hardirq_trylock(int cpu) extern void synchronize_irq(void); -#endif /* __SMP__ */ +#endif /* CONFIG_SMP */ #endif /* _ALPHA_HARDIRQ_H */ -- cgit v1.2.3