diff options
Diffstat (limited to 'include/asm-m68k/hardirq.h')
| -rw-r--r-- | include/asm-m68k/hardirq.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/asm-m68k/hardirq.h b/include/asm-m68k/hardirq.h index e9d0136c3..512e0b054 100644 --- a/include/asm-m68k/hardirq.h +++ b/include/asm-m68k/hardirq.h @@ -1,24 +1,13 @@ #ifndef __M68K_HARDIRQ_H #define __M68K_HARDIRQ_H -extern unsigned int local_irq_count[NR_CPUS]; -#define in_interrupt() (local_irq_count[smp_processor_id()] != 0) - -#define hardirq_trylock(cpu) ((cpu)==0) /* always true */ -#define hardirq_endlock(cpu) do { } while (0) - -#define hardirq_enter(cpu) (local_irq_count[cpu]++) -#define hardirq_exit(cpu) (local_irq_count[cpu]--) - -#endif -#ifndef __M68K_HARDIRQ_H -#define __M68K_HARDIRQ_H +#include <linux/tasks.h> extern unsigned int local_irq_count[NR_CPUS]; #define in_interrupt() (local_irq_count[smp_processor_id()] != 0) -#define hardirq_trylock(cpu) ((cpu)==0) /* always true */ -#define hardirq_endlock(cpu) do { } while (0) +#define hardirq_trylock(cpu) (++local_irq_count[cpu], (cpu) == 0) +#define hardirq_endlock(cpu) (--local_irq_count[cpu]) #define hardirq_enter(cpu) (local_irq_count[cpu]++) #define hardirq_exit(cpu) (local_irq_count[cpu]--) |