diff options
| author | Chen, Kenneth W <kenneth.w.chen@intel.com> | 2006-03-25 06:06:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:22:50 -0500 |
| commit | a7d06ca7b626c9257bee4439d9d80a7e44ae237e (patch) | |
| tree | 1951ab3f604771885987b46d8858711a4d3ddf88 | |
| parent | d3f4aaa3d7b4152dac28751ee902f769d03289a1 (diff) | |
[PATCH] x86: HUGETLBFS and DEBUG_PAGEALLOC are incompatible
DEBUG_PAGEALLOC is not compatible with hugetlb page support. That debug
option turns off PSE. Once it is turned off in CR4, the cpu will ignore
pse bit in the pmd and causing infinite page-not- present faults.
So disable DEBUG_PAGEALLOC if the user selected hugetlbfs.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug index 00108ba9a78d..c23da8896f39 100644 --- a/arch/i386/Kconfig.debug +++ b/arch/i386/Kconfig.debug | |||
| @@ -45,7 +45,7 @@ comment "Page alloc debug is incompatible with Software Suspend on i386" | |||
| 45 | 45 | ||
| 46 | config DEBUG_PAGEALLOC | 46 | config DEBUG_PAGEALLOC |
| 47 | bool "Page alloc debugging" | 47 | bool "Page alloc debugging" |
| 48 | depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND | 48 | depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND && !HUGETLBFS |
| 49 | help | 49 | help |
| 50 | Unmap pages from the kernel linear mapping after free_pages(). | 50 | Unmap pages from the kernel linear mapping after free_pages(). |
| 51 | This results in a large slowdown, but helps to find certain types | 51 | This results in a large slowdown, but helps to find certain types |