Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 377f6dd20e1799afe57f9881e3cd8ac222697f8e..96783645092dc106cd4f4b300958aeae5b684e2a 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -11,4 +11,16 @@ config LBD
          your machine, or if you want to have a raid or loopback device
          bigger than 2TB.  Otherwise say N.
 
+config BLK_DEV_IO_TRACE
+       bool "Support for tracing block io actions"
+       select RELAY
+       select DEBUG_FS
+       help
+         Say Y here, if you want to be able to trace the block layer actions
+         on a given queue. Tracing allows you to see any traffic happening
+         on a block device queue. For more information (and the user space
+         support tools needed), fetch the blktrace app from:
+
+         git://brick.kernel.dk/data/git/blktrace.git
+
 source block/Kconfig.iosched