diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-ia64 | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/hardirq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/hardirq.h b/include/asm-ia64/hardirq.h index 7c1a4d109..1dabc1bdf 100644 --- a/include/asm-ia64/hardirq.h +++ b/include/asm-ia64/hardirq.h @@ -49,7 +49,7 @@ typedef struct { #include <asm/smp.h> extern unsigned int global_irq_holder; -extern volatile unsigned int global_irq_lock; +extern volatile unsigned long global_irq_lock; static inline int irqs_running (void) { |