---

 25-akpm/arch/ia64/lib/dec_and_lock.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN arch/ia64/lib/dec_and_lock.c~ia64-lockmeter-fix arch/ia64/lib/dec_and_lock.c
--- 25/arch/ia64/lib/dec_and_lock.c~ia64-lockmeter-fix	Wed Jan 21 04:23:44 2004
+++ 25-akpm/arch/ia64/lib/dec_and_lock.c	Wed Jan 21 04:24:05 2004
@@ -13,6 +13,7 @@
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
 
+#ifndef CONFIG_LOCKMETER
 /*
  * Decrement REFCOUNT and if the count reaches zero, acquire the spinlock.  Both of these
  * operations have to be done atomically, so that the count doesn't drop to zero without
@@ -40,3 +41,4 @@ atomic_dec_and_lock (atomic_t *refcount,
 }
 
 EXPORT_SYMBOL(atomic_dec_and_lock);
+#endif

_