diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /arch/sparc64/kernel/irq.c | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'arch/sparc64/kernel/irq.c')
| -rw-r--r-- | arch/sparc64/kernel/irq.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index a4904efb3..12925b1c2 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c @@ -1,4 +1,4 @@ -/* $Id: irq.c,v 1.88 2000/06/26 19:40:27 davem Exp $ +/* $Id: irq.c,v 1.89 2000/06/30 10:18:38 davem Exp $ * irq.c: UltraSparc IRQ handling/init/registry. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) @@ -552,8 +552,8 @@ out: * lives in the brlock table for cache reasons. */ #ifndef CONFIG_SMP -unsigned int local_irq_count; -unsigned int local_bh_count; +unsigned int __local_irq_count; +unsigned int __local_bh_count; #else /* Who has global_irq_lock. */ @@ -605,14 +605,14 @@ again: spinlock_t *lock; if (!irqs_running() && - (local_bh_count || !spin_is_locked(&global_bh_lock))) + (local_bh_count(smp_processor_id()) || !spin_is_locked(&global_bh_lock))) break; br_write_unlock(BR_GLOBALIRQ_LOCK); lock = &__br_write_locks[BR_GLOBALIRQ_LOCK].lock; while (irqs_running() || spin_is_locked(lock) || - (!local_bh_count && spin_is_locked(&global_bh_lock))) { + (!local_bh_count(smp_processor_id()) && spin_is_locked(&global_bh_lock))) { if (!--count) { show("wait_on_irq"); count = (~0 >> 1); @@ -635,7 +635,7 @@ void __global_cli(void) if(flags == 0) { int cpu = smp_processor_id(); __cli(); - if (! local_irq_count) + if (! local_irq_count(cpu)) get_irqlock(cpu); } } @@ -644,7 +644,7 @@ void __global_sti(void) { int cpu = smp_processor_id(); - if (! local_irq_count) + if (! local_irq_count(cpu)) release_irqlock(cpu); __sti(); } @@ -656,7 +656,7 @@ unsigned long __global_save_flags(void) __save_flags(flags); local_enabled = ((flags == 0) ? 1 : 0); retval = 2 + local_enabled; - if (! local_irq_count) { + if (! local_irq_count(smp_processor_id())) { if (local_enabled) retval = 1; if (global_irq_holder == (unsigned char) smp_processor_id()) |