summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-26 10:25:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-26 10:25:59 +0200
commit3cf430b0636045dc524759a0852293ba037732a7 (patch)
tree2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /arch/sh/mm/Kconfig
parentwait_task_inactive: "improve" the returned value for ->nvcsw == 0 (diff)
parentFix oops in acer_wmi driver (acer_wmi_init) (diff)
downloadlinux-3cf430b0636045dc524759a0852293ba037732a7.tar.xz
linux-3cf430b0636045dc524759a0852293ba037732a7.zip
Merge branch 'linus' into sched/devel
Diffstat (limited to 'arch/sh/mm/Kconfig')
-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 9c131cac91a4..8a03926ea84f 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"