Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-block.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 881c3f84e88a32da05751dad0b54c0fbca5468e7..36c34c9909fa2dc396b68a847961c73396c788ba 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -389,6 +389,15 @@ config PAHOLE_HAS_BTF_TAG
          btf_decl_tag) or not. Currently only clang compiler implements
          these attributes, so make the config depend on CC_IS_CLANG.
 
+config PAHOLE_HAS_LANG_EXCLUDE
+       def_bool PAHOLE_VERSION >= 124
+       help
+         Support for the --lang_exclude flag which makes pahole exclude
+         compilation units from the supplied language. Used in Kbuild to
+         omit Rust CUs which are not supported in version 1.24 of pahole,
+         otherwise it would emit malformed kernel and module binaries when
+         using DEBUG_INFO_BTF_MODULES.
+
 config DEBUG_INFO_BTF_MODULES
        def_bool y
        depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
@@ -1917,7 +1926,7 @@ config FUNCTION_ERROR_INJECTION
        help
          Add fault injections into various functions that are annotated with
          ALLOW_ERROR_INJECTION() in the kernel. BPF may also modify the return
-         value of theses functions. This is useful to test error paths of code.
+         value of these functions. This is useful to test error paths of code.
 
          If unsure, say N
 
@@ -2566,6 +2575,15 @@ config MEMCPY_KUNIT_TEST
 
          If unsure, say N.
 
+config MEMCPY_SLOW_KUNIT_TEST
+       bool "Include exhaustive memcpy tests"
+       depends on MEMCPY_KUNIT_TEST
+       default y
+       help
+         Some memcpy tests are quite exhaustive in checking for overlaps
+         and bit ranges. These can be very slow, so they are split out
+         as a separate config, in case they need to be disabled.
+
 config IS_SIGNED_TYPE_KUNIT_TEST
        tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS
        depends on KUNIT