diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /arch/sparc64/prom/p1275.c | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'arch/sparc64/prom/p1275.c')
| -rw-r--r-- | arch/sparc64/prom/p1275.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c index f30bdd3a8..5a4e4b693 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc64/prom/p1275.c @@ -1,4 +1,4 @@ -/* $Id: p1275.c,v 1.18 1999/09/10 10:40:53 davem Exp $ +/* $Id: p1275.c,v 1.20 1999/11/23 23:47:56 davem Exp $ * p1275.c: Sun IEEE 1275 PROM low level interface routines * * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -252,11 +252,7 @@ void prom_cif_callback(void) * the counter is needed. -DaveM */ static int prom_entry_depth = 0; -static spinlock_t prom_entry_lock = SPIN_LOCK_UNLOCKED; -#ifdef __SMP__ -extern void smp_capture(void); -extern void smp_release(void); -#endif +spinlock_t prom_entry_lock = SPIN_LOCK_UNLOCKED; static __inline__ unsigned long prom_get_lock(void) { @@ -270,9 +266,6 @@ static __inline__ unsigned long prom_get_lock(void) if (prom_entry_depth != 0) panic("prom_get_lock"); #endif -#ifdef __SMP__ - smp_capture(); -#endif } prom_entry_depth++; @@ -281,12 +274,9 @@ static __inline__ unsigned long prom_get_lock(void) static __inline__ void prom_release_lock(unsigned long flags) { - if (--prom_entry_depth == 0) { -#ifdef __SMP__ - smp_release(); -#endif + if (--prom_entry_depth == 0) spin_unlock(&prom_entry_lock); - } + __restore_flags(flags); } |