Merge tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / mm / Kconfig.debug

diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 864f129..1e73717 100644 (file)
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -64,7 +64,6 @@ config PAGE_OWNER
 
 config PAGE_POISONING
        bool "Poison pages after freeing"
-       select PAGE_POISONING_NO_SANITY if HIBERNATION
        help
          Fill the pages with poison patterns after free_pages() and verify
          the patterns before alloc_pages. The filling of the memory helps
@@ -75,30 +74,11 @@ config PAGE_POISONING
          Note that "poison" here is not the same thing as the "HWPoison"
          for CONFIG_MEMORY_FAILURE. This is software poisoning only.
 
-         If unsure, say N
-
-config PAGE_POISONING_NO_SANITY
-       depends on PAGE_POISONING
-       bool "Only poison, don't sanity check"
-       help
-          Skip the sanity checking on alloc, only fill the pages with
-          poison on free. This reduces some of the overhead of the
-          poisoning feature.
-
-          If you are only interested in sanitization, say Y. Otherwise
-          say N.
+         If you are only interested in sanitization of freed pages without
+         checking the poison pattern on alloc, you can boot the kernel with
+         "init_on_free=1" instead of enabling this.
 
-config PAGE_POISONING_ZERO
-       bool "Use zero for poisoning instead of debugging value"
-       depends on PAGE_POISONING
-       help
-          Instead of using the existing poison value, fill the pages with
-          zeros. This makes it harder to detect when errors are occurring
-          due to sanitization but the zeroing at free means that it is
-          no longer necessary to write zeros when GFP_ZERO is used on
-          allocation.
-
-          If unsure, say N
+         If unsure, say N
 
 config DEBUG_PAGE_REF
        bool "Enable tracepoint to track down page reference manipulation"