Commit a99e0107 authored by Barry K. Nathan's avatar Barry K. Nathan Committed by Linus Torvalds

[PATCH] kconfig: DEBUG_PAGEALLOC and SOFTWARE_SUSPEND are incompatible on i386

On i386, SOFTWARE_SUSPEND requires the CPU to have PSE support, but
DEBUG_PAGEALLOC disables PSE.  Thus, allowing both options to be enabled
simultaneously makes no sense.  This patch disables DEBUG_PAGEALLOC if
SOFTWARE_SUSPEND is enabled; it also displays a comment to briefly explain
why DEBUG_PAGEALLOC is missing in that case.

I have tested this patch against oldconfig and menuconfig on 2.6.11-bk2.
Signed-off-by: default avatarBarry K. Nathan <barryn@pobox.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3b3add16
...@@ -38,9 +38,12 @@ config DEBUG_STACK_USAGE ...@@ -38,9 +38,12 @@ config DEBUG_STACK_USAGE
This option will slow down process creation somewhat. This option will slow down process creation somewhat.
comment "Page alloc debug is incompatible with Software Suspend on i386"
depends on DEBUG_KERNEL && SOFTWARE_SUSPEND
config DEBUG_PAGEALLOC config DEBUG_PAGEALLOC
bool "Page alloc debugging" bool "Page alloc debugging"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND
help help
Unmap pages from the kernel linear mapping after free_pages(). Unmap pages from the kernel linear mapping after free_pages().
This results in a large slowdown, but helps to find certain types This results in a large slowdown, but helps to find certain types
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment