---

yaml --- r: 108913 b: refs/heads/master c: 68b7c24 h: refs/heads/master i: 108911: 06fd0cc v: v3
git-mirror · Aug 11, 2008 · 46af37d · 46af37d
1 parent 40f42c8
commit 46af37d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d09d328c119a9ac20615fc8b1431aa417955ad4d
+refs/heads/master: 68b7c24cf9c699ed93c4a70f958b5bb3943723bc
diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/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"