summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-08-06 15:10:49 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-08-11 20:17:49 +0900
commit68b7c24cf9c699ed93c4a70f958b5bb3943723bc (patch)
treebecce75d1e70e9e9834a6b3335ae23ba2bcec8a7
parentd09d328c119a9ac20615fc8b1431aa417955ad4d (diff)
downloadop-kernel-dev-68b7c24cf9c699ed93c4a70f958b5bb3943723bc.zip
op-kernel-dev-68b7c24cf9c699ed93c4a70f958b5bb3943723bc.tar.gz
sh: Disable 64kB hugetlbpage size when using 64kB PAGE_SIZE.
Presently we oops in mm/hugetlb.c:1325, which is the order == 0 test in hugetlb_add_hstate() called at initialization time. So, disable 64kB huge pages when we're using a 64kB PAGE_SIZE. On most parts this will force the default to be 1MB huge pages. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/mm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 9c131ca..8a03926 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -181,10 +181,12 @@ config ENTRY_OFFSET
choice
prompt "HugeTLB page size"
depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU
+ default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB
default HUGETLB_PAGE_SIZE_64K
config HUGETLB_PAGE_SIZE_64K
bool "64kB"
+ depends on !PAGE_SIZE_64KB
config HUGETLB_PAGE_SIZE_256K
bool "256kB"
OpenPOWER on IntegriCloud