diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/sparc64/prom | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/sparc64/prom')
| -rw-r--r-- | arch/sparc64/prom/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc64/prom/misc.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile index 88ca5251b..04471ab85 100644 --- a/arch/sparc64/prom/Makefile +++ b/arch/sparc64/prom/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1999/12/21 04:02:26 davem Exp $ +# $Id: Makefile,v 1.6 2000/03/31 04:06:25 davem Exp $ # Makefile for the Sun Boot PROM interface library under # Linux. # diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 8d6404fea..50b287080 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c @@ -1,4 +1,4 @@ -/* $Id: misc.c,v 1.16 1999/11/19 05:53:04 davem Exp $ +/* $Id: misc.c,v 1.17 2000/04/15 06:02:50 davem Exp $ * misc.c: Miscellaneous prom functions that don't belong * anywhere else. * @@ -64,7 +64,7 @@ prom_cmdline(void) * on SMP, we need to drop the IRQ locks we hold. */ #ifdef __SMP__ - hardirq_exit(smp_processor_id()); + irq_exit(smp_processor_id(), 0); smp_capture(); #else local_irq_count--; @@ -74,8 +74,8 @@ prom_cmdline(void) #ifdef __SMP__ smp_release(); - hardirq_enter(smp_processor_id()); - spin_unlock_wait(&global_irq_lock); + irq_enter(smp_processor_id(), 0); + spin_unlock_wait(&__br_write_locks[BR_GLOBALIRQ_LOCK].lock); #else local_irq_count++; #endif |