diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 22:17:07 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 22:17:07 -0400 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /arch/sh/mm/Kconfig | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 (diff) | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'arch/sh/mm/Kconfig')
| -rw-r--r-- | arch/sh/mm/Kconfig | 2 |
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 | |||
| 181 | choice | 181 | choice |
| 182 | prompt "HugeTLB page size" | 182 | prompt "HugeTLB page size" |
| 183 | depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU | 183 | depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU |
| 184 | default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB | ||
| 184 | default HUGETLB_PAGE_SIZE_64K | 185 | default HUGETLB_PAGE_SIZE_64K |
| 185 | 186 | ||
| 186 | config HUGETLB_PAGE_SIZE_64K | 187 | config HUGETLB_PAGE_SIZE_64K |
| 187 | bool "64kB" | 188 | bool "64kB" |
| 189 | depends on !PAGE_SIZE_64KB | ||
| 188 | 190 | ||
| 189 | config HUGETLB_PAGE_SIZE_256K | 191 | config HUGETLB_PAGE_SIZE_256K |
| 190 | bool "256kB" | 192 | bool "256kB" |