Merge tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 4e7f0ff83ae7b162c43355b6727019c7edfbe897..61a33f4ba608cdc2fe01f691f46f92b2aba1d3e7 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -165,6 +165,27 @@ config FW_LOADER_USER_HELPER_FALLBACK
 
          If you are unsure about this, say N here.
 
+config WANT_DEV_COREDUMP
+       bool
+       help
+         Drivers should "select" this option if they desire to use the
+         device coredump mechanism.
+
+config DISABLE_DEV_COREDUMP
+       bool "Disable device coredump" if EXPERT
+       help
+         Disable the device coredump mechanism despite drivers wanting to
+         use it; this allows for more sensitive systems or systems that
+         don't want to ever access the information to not have the code,
+         nor keep any data.
+
+         If unsure, say N.
+
+config DEV_COREDUMP
+       bool
+       default y if WANT_DEV_COREDUMP
+       depends on !DISABLE_DEV_COREDUMP
+
 config DEBUG_DRIVER
        bool "Driver Core verbose debug messages"
        depends on DEBUG_KERNEL
@@ -231,6 +252,9 @@ config DMA_CMA
          to allocate big physically-contiguous blocks of memory for use with
          hardware components that do not support I/O map nor scatter-gather.
 
+         You can disable CMA by specifying "cma=0" on the kernel's command
+         line.
+
          For more information see <include/linux/dma-contiguous.h>.
          If unsure, say "n".