Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-x86_64-akpm/include/asm-x86_64/spinlock.h | 13 -------------
1 files changed, 13 deletions(-)
diff -puN include/asm-x86_64/spinlock.h~lockmeter2-build-fix include/asm-x86_64/spinlock.h
--- 25-x86_64/include/asm-x86_64/spinlock.h~lockmeter2-build-fix Thu Sep 16 15:32:04 2004
+++ 25-x86_64-akpm/include/asm-x86_64/spinlock.h Thu Sep 16 15:32:04 2004
@@ -223,19 +223,6 @@ static inline int _raw_write_trylock(rwl
return 0;
}
-#ifdef CONFIG_LOCKMETER
-static inline int _raw_read_trylock(rwlock_t *lock)
-{
-/* FIXME -- replace with assembler */
- atomic_t *count = (atomic_t *)lock;
- atomic_dec(count);
- if (count->counter > 0)
- return 1;
- atomic_inc(count);
- return 0;
-}
-#endif
-
#if defined(CONFIG_LOCKMETER) && defined(CONFIG_HAVE_DEC_LOCK)
extern void _metered_spin_lock (spinlock_t *lock, void *caller_pc);
extern void _metered_spin_unlock(spinlock_t *lock);
_