Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / mm / Kconfig.debug

diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index bb01e298f260b84c82b03acdfb11582e42ecbbe6..aa99fd1f7109f03ef24085dd2ab37e5eb7c72534 100644 (file)
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -2,6 +2,7 @@ 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