diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /arch/ia64/kernel/irq_lock.c | |
parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'arch/ia64/kernel/irq_lock.c')
-rw-r--r-- | arch/ia64/kernel/irq_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/irq_lock.c b/arch/ia64/kernel/irq_lock.c index 9c512dd4e..4a2ead673 100644 --- a/arch/ia64/kernel/irq_lock.c +++ b/arch/ia64/kernel/irq_lock.c @@ -26,7 +26,7 @@ int global_irq_holder = NO_PROC_ID; spinlock_t global_irq_lock; atomic_t global_irq_count; atomic_t global_bh_count; -atomic_t global_bh_lock; +spinlock_t global_bh_lock; #define INIT_STUCK (1<<26) |