diff -urpN -X /home/fletch/.diff.exclude 510-fasync_lock_rcu/arch/ia64/Kconfig 520-lockmeter_ia64/arch/ia64/Kconfig
--- 510-fasync_lock_rcu/arch/ia64/Kconfig	Mon Nov 17 18:29:41 2003
+++ 520-lockmeter_ia64/arch/ia64/Kconfig	Wed Dec 24 19:08:32 2003
@@ -670,6 +670,14 @@ config DEBUG_INFO
 	  Say Y here only if you plan to use gdb to debug the kernel.
 	  If you don't debug the kernel, you can say N.
 	  
+config LOCKMETER
+	bool "Kernel lock metering"
+	depends on SMP
+	help
+	  Say Y to enable kernel lock metering, which adds overhead to SMP 
+	  locks, but allows you to see various statistics using the 
+	  lockstat command.
+
 endmenu
 
 source "security/Kconfig"