diff options
author | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
commit | 1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch) | |
tree | 77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /mm/Kconfig.debug | |
parent | xfs: Remove some pointless quota checks (diff) | |
parent | quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units (diff) | |
download | linux-dev-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.tar.xz linux-dev-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.zip |
Merge branch 'for_linus' into for_next
Diffstat (limited to 'mm/Kconfig.debug')
-rw-r--r-- | mm/Kconfig.debug | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug index 56badfc4810a..957d3da53ddd 100644 --- a/mm/Kconfig.debug +++ b/mm/Kconfig.debug @@ -14,7 +14,6 @@ config DEBUG_PAGEALLOC depends on !KMEMCHECK select PAGE_EXTENSION select PAGE_POISONING if !ARCH_SUPPORTS_DEBUG_PAGEALLOC - select PAGE_GUARD if ARCH_SUPPORTS_DEBUG_PAGEALLOC ---help--- Unmap pages from the kernel linear mapping after free_pages(). This results in a large slowdown, but helps to find certain types @@ -27,13 +26,5 @@ config DEBUG_PAGEALLOC that would result in incorrect warnings of memory corruption after a resume because free pages are not saved to the suspend image. -config WANT_PAGE_DEBUG_FLAGS - bool - config PAGE_POISONING bool - select WANT_PAGE_DEBUG_FLAGS - -config PAGE_GUARD - bool - select WANT_PAGE_DEBUG_FLAGS |