diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
| commit | 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca (patch) | |
| tree | 1f967f283dade6e03897169bb29513354f49f910 /mm | |
| parent | 50223e486cabdcf7e540e519da1f26bab3084e5d (diff) | |
| parent | 24ed7a97464db44592495f98cff8bcee02f92bc2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig.debug | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug index aa99fd1f7109..af7cfb43d2f0 100644 --- a/mm/Kconfig.debug +++ b/mm/Kconfig.debug | |||
| @@ -6,7 +6,7 @@ config DEBUG_PAGEALLOC | |||
| 6 | ---help--- | 6 | ---help--- |
| 7 | Unmap pages from the kernel linear mapping after free_pages(). | 7 | Unmap pages from the kernel linear mapping after free_pages(). |
| 8 | This results in a large slowdown, but helps to find certain types | 8 | This results in a large slowdown, but helps to find certain types |
| 9 | of memory corruptions. | 9 | of memory corruption. |
| 10 | 10 | ||
| 11 | config WANT_PAGE_DEBUG_FLAGS | 11 | config WANT_PAGE_DEBUG_FLAGS |
| 12 | bool | 12 | bool |
| @@ -17,11 +17,11 @@ config PAGE_POISONING | |||
| 17 | depends on !HIBERNATION | 17 | depends on !HIBERNATION |
| 18 | select DEBUG_PAGEALLOC | 18 | select DEBUG_PAGEALLOC |
| 19 | select WANT_PAGE_DEBUG_FLAGS | 19 | select WANT_PAGE_DEBUG_FLAGS |
| 20 | help | 20 | ---help--- |
| 21 | Fill the pages with poison patterns after free_pages() and verify | 21 | Fill the pages with poison patterns after free_pages() and verify |
| 22 | the patterns before alloc_pages(). This results in a large slowdown, | 22 | the patterns before alloc_pages(). This results in a large slowdown, |
| 23 | but helps to find certain types of memory corruptions. | 23 | but helps to find certain types of memory corruption. |
| 24 | 24 | ||
| 25 | This option cannot enalbe with hibernation. Otherwise, it will get | 25 | This option cannot be enabled in combination with hibernation as |
| 26 | wrong messages for memory corruption because the free pages are not | 26 | that would result in incorrect warnings of memory corruption after |
| 27 | saved to the suspend image. | 27 | a resume because free pages are not saved to the suspend image. |