diff -purN -X /home/mbligh/.diff.exclude 130-lockmeter/arch/ia64/Kconfig 131-lockmeter_ia64/arch/ia64/Kconfig
--- 130-lockmeter/arch/ia64/Kconfig	2004-02-04 16:23:50.000000000 -0800
+++ 131-lockmeter_ia64/arch/ia64/Kconfig	2004-02-28 09:54:16.000000000 -0800
@@ -662,6 +662,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"