Merge tag 'efi-urgent' into x86/urgent

[~andy/linux] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6982094a7e74aa8c5daea87f90878174a8d746c1..dbf94a7d25a8a1c7be60d62f29680e69e1261f1b 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1556,17 +1556,6 @@ config PROVIDE_OHCI1394_DMA_INIT
 
          See Documentation/debugging-via-ohci1394.txt for more information.
 
-config FIREWIRE_OHCI_REMOTE_DMA
-       bool "Remote debugging over FireWire with firewire-ohci"
-       depends on FIREWIRE_OHCI
-       help
-         This option lets you use the FireWire bus for remote debugging
-         with help of the firewire-ohci driver. It enables unfiltered
-         remote DMA in firewire-ohci.
-         See Documentation/debugging-via-ohci1394.txt for more information.
-
-         If unsure, say N.
-
 config BUILD_DOCSRC
        bool "Build targets in Documentation/ tree"
        depends on HEADERS_CHECK
@@ -1584,8 +1573,43 @@ config DMA_API_DEBUG
          With this option you will be able to detect common bugs in device
          drivers like double-freeing of DMA mappings or freeing mappings that
          were never allocated.
-         This option causes a performance degredation.  Use only if you want
-         to debug device drivers. If unsure, say N.
+
+         This also attempts to catch cases where a page owned by DMA is
+         accessed by the cpu in a way that could cause data corruption.  For
+         example, this enables cow_user_page() to check that the source page is
+         not undergoing DMA.
+
+         This option causes a performance degradation.  Use only if you want to
+         debug device drivers and dma interactions.
+
+         If unsure, say N.
+
+config TEST_MODULE
+       tristate "Test module loading with 'hello world' module"
+       default n
+       depends on m
+       help
+         This builds the "test_module" module that emits "Hello, world"
+         on printk when loaded. It is designed to be used for basic
+         evaluation of the module loading subsystem (for example when
+         validating module verification). It lacks any extra dependencies,
+         and will not normally be loaded by the system unless explicitly
+         requested by name.
+
+         If unsure, say N.
+
+config TEST_USER_COPY
+       tristate "Test user/kernel boundary protections"
+       default n
+       depends on m
+       help
+         This builds the "test_user_copy" module that runs sanity checks
+         on the copy_to/from_user infrastructure, making sure basic
+         user/kernel boundary testing is working. If it fails to load,
+         a regression has been detected in the user/kernel memory boundary
+         protections.
+
+         If unsure, say N.
 
 source "samples/Kconfig"