powerpc: Fix hugetlb with CONFIG_PPC_MM_SLICES=y
authorPaul Mackerras <paulus@samba.org>
Tue, 20 Sep 2011 19:58:10 +0000 (19:58 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 23 Sep 2011 00:21:33 +0000 (10:21 +1000)
commit25c29f9e3242071bca1bee7ad919baf1888ae436
tree4568edb56ff09832d82344e3e9c32875413950d4
parent7b72c9f8750e32b3b08fab1bfef43350866ae8d1
powerpc: Fix hugetlb with CONFIG_PPC_MM_SLICES=y

Commit 41151e77a4 ("powerpc: Hugetlb for BookE") added some
#ifdef CONFIG_MM_SLICES conditionals to hugetlb_get_unmapped_area()
and vma_mmu_pagesize().  Unfortunately this is not the correct config
symbol; it should be CONFIG_PPC_MM_SLICES.  The result is that
attempting to use hugetlbfs on 64-bit Power server processors results
in an infinite stack recursion between get_unmapped_area() and
hugetlb_get_unmapped_area().

This fixes it by changing the #ifdef to use CONFIG_PPC_MM_SLICES
in those functions and also in book3e_hugetlb_preload().

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/mm/hugetlbpage-book3e.c
arch/powerpc/mm/hugetlbpage.c