netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / mm / Kconfig.debug

diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index bb01e29..af7cfb4 100644 (file)
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -2,10 +2,11 @@ config DEBUG_PAGEALLOC
        bool "Debug page memory allocations"
        depends on DEBUG_KERNEL && ARCH_SUPPORTS_DEBUG_PAGEALLOC
        depends on !HIBERNATION || !PPC && !SPARC
+       depends on !KMEMCHECK
        ---help---
          Unmap pages from the kernel linear mapping after free_pages().
          This results in a large slowdown, but helps to find certain types
-         of memory corruptions.
+         of memory corruption.
 
 config WANT_PAGE_DEBUG_FLAGS
        bool
@@ -16,11 +17,11 @@ config PAGE_POISONING
        depends on !HIBERNATION
        select DEBUG_PAGEALLOC
        select WANT_PAGE_DEBUG_FLAGS
-       help
+       ---help---
           Fill the pages with poison patterns after free_pages() and verify
           the patterns before alloc_pages(). This results in a large slowdown,
-          but helps to find certain types of memory corruptions.
+          but helps to find certain types of memory corruption.
 
-          This option cannot enalbe with hibernation. Otherwise, it will get
-          wrong messages for memory corruption because the free pages are not
-          saved to the suspend image.
+          This option cannot be enabled in combination with hibernation as
+          that would result in incorrect warnings of memory corruption after
+          a resume because free pages are not saved to the suspend image.