Pārlūkot izejas kodu

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>
Paul Mundt 17 gadi atpakaļ
vecāks
revīzija
68b7c24cf9
1 mainītis faili ar 2 papildinājumiem un 0 dzēšanām
  1. 2 0
      arch/sh/mm/Kconfig

+ 2 - 0
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"