Commit 41683902 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fix from Michael Ellerman:

 - Reinstate ARCH_FORCE_MAX_ORDER ranges to fix various breakage

* tag 'powerpc-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/mm: Reinstate ARCH_FORCE_MAX_ORDER ranges
parents 4e893b5a 358e526a

arch/powerpc/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -906,11 +906,17 @@ config DATA_SHIFT 


config ARCH_FORCE_MAX_ORDER

	int "Order of maximal physically contiguous allocations"

	range 7 8 if PPC64 && PPC_64K_PAGES

	default "8" if PPC64 && PPC_64K_PAGES

	range 12 12 if PPC64 && !PPC_64K_PAGES

	default "12" if PPC64 && !PPC_64K_PAGES

	range 8 10 if PPC32 && PPC_16K_PAGES

	default "8" if PPC32 && PPC_16K_PAGES

	range 6 10 if PPC32 && PPC_64K_PAGES

	default "6" if PPC32 && PPC_64K_PAGES

	range 4 10 if PPC32 && PPC_256K_PAGES

	default "4" if PPC32 && PPC_256K_PAGES

	range 10 10

	default "10"

	help

	  The kernel page allocator limits the size of maximal physically