diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /include/linux/brlock.h | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/linux/brlock.h')
| -rw-r--r-- | include/linux/brlock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/brlock.h b/include/linux/brlock.h index e68940b0f..2fd39cac9 100644 --- a/include/linux/brlock.h +++ b/include/linux/brlock.h @@ -77,7 +77,7 @@ extern void __br_lock_usage_bug (void); #ifdef __BRLOCK_USE_ATOMICS -extern inline void br_read_lock (enum brlock_indices idx) +static inline void br_read_lock (enum brlock_indices idx) { /* * This causes a link-time bug message if an @@ -89,7 +89,7 @@ extern inline void br_read_lock (enum brlock_indices idx) read_lock(&__brlock_array[smp_processor_id()][idx]); } -extern inline void br_read_unlock (enum brlock_indices idx) +static inline void br_read_unlock (enum brlock_indices idx) { if (idx >= __BR_END) __br_lock_usage_bug(); @@ -98,7 +98,7 @@ extern inline void br_read_unlock (enum brlock_indices idx) } #else /* ! __BRLOCK_USE_ATOMICS */ -extern inline void br_read_lock (enum brlock_indices idx) +static inline void br_read_lock (enum brlock_indices idx) { unsigned int *ctr; spinlock_t *lock; @@ -124,7 +124,7 @@ again: } } -extern inline void br_read_unlock (enum brlock_indices idx) +static inline void br_read_unlock (enum brlock_indices idx) { unsigned int *ctr; @@ -143,14 +143,14 @@ extern inline void br_read_unlock (enum brlock_indices idx) extern void FASTCALL(__br_write_lock (enum brlock_indices idx)); extern void FASTCALL(__br_write_unlock (enum brlock_indices idx)); -extern inline void br_write_lock (enum brlock_indices idx) +static inline void br_write_lock (enum brlock_indices idx) { if (idx >= __BR_END) __br_lock_usage_bug(); __br_write_lock(idx); } -extern inline void br_write_unlock (enum brlock_indices idx) +static inline void br_write_unlock (enum brlock_indices idx) { if (idx >= __BR_END) __br_lock_usage_bug(); |