Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux...

[deliverable/linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f75a33f29f6e9b55c1e4b5ab9e1b355565fbaec6..ecb9e75614bf87f1e368074d6ef84bfe3f1003b8 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1893,6 +1893,8 @@ source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"
 
+source "lib/Kconfig.ubsan"
+
 config ARCH_HAS_DEVMEM_IS_ALLOWED
        bool
 
@@ -1919,7 +1921,6 @@ config STRICT_DEVMEM
 config IO_STRICT_DEVMEM
        bool "Filter I/O access to /dev/mem"
        depends on STRICT_DEVMEM
-       default STRICT_DEVMEM
        ---help---
          If this option is disabled, you allow userspace (root) access to all
          io-memory regardless of whether a driver is actively using that