diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /include/asm-sparc64/softirq.h | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'include/asm-sparc64/softirq.h')
| -rw-r--r-- | include/asm-sparc64/softirq.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-sparc64/softirq.h b/include/asm-sparc64/softirq.h index 8386e4a15..397d6bf50 100644 --- a/include/asm-sparc64/softirq.h +++ b/include/asm-sparc64/softirq.h @@ -68,6 +68,8 @@ extern atomic_t __sparc64_bh_counter; #include <asm/spinlock.h> +extern spinlock_t global_bh_lock; + #define init_bh(nr, routine) \ do { unsigned long flags; \ int ent = nr; \ @@ -115,13 +117,13 @@ do { unsigned long flags; \ #define softirq_trylock() \ ({ \ int ret = 1; \ - if(atomic_add_return(1, &__sparc_bh_counter) != 1) { \ - atomic_dec(&__sparc_bh_counter); \ + if(atomic_add_return(1, &__sparc64_bh_counter) != 1) { \ + atomic_dec(&__sparc64_bh_counter); \ ret = 0; \ } \ ret; \ }) -#define softirq_endlock() atomic_dec(&__sparc_bh_counter) +#define softirq_endlock() atomic_dec(&__sparc64_bh_counter) #define clear_active_bhs(mask) \ do { unsigned long flags; \ spin_lock_irqsave(&global_bh_lock, flags); \ |