aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/mm/hugetlbpage-book3e.c2
-rw-r--r--arch/powerpc/mm/hugetlbpage.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/hugetlbpage-book3e.c b/arch/powerpc/mm/hugetlbpage-book3e.c
index 1295b7c1cdac..343ad0b87261 100644
--- a/arch/powerpc/mm/hugetlbpage-book3e.c
+++ b/arch/powerpc/mm/hugetlbpage-book3e.c
@@ -52,7 +52,7 @@ void book3e_hugetlb_preload(struct mm_struct *mm, unsigned long ea, pte_t pte)
52 if (unlikely(is_kernel_addr(ea))) 52 if (unlikely(is_kernel_addr(ea)))
53 return; 53 return;
54 54
55#ifdef CONFIG_MM_SLICES 55#ifdef CONFIG_PPC_MM_SLICES
56 psize = mmu_get_tsize(get_slice_psize(mm, ea)); 56 psize = mmu_get_tsize(get_slice_psize(mm, ea));
57 tsize = mmu_get_psize(psize); 57 tsize = mmu_get_psize(psize);
58 shift = mmu_psize_defs[psize].shift; 58 shift = mmu_psize_defs[psize].shift;
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 3a5f59dcbb33..48b65bedc04d 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -690,7 +690,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
690 unsigned long len, unsigned long pgoff, 690 unsigned long len, unsigned long pgoff,
691 unsigned long flags) 691 unsigned long flags)
692{ 692{
693#ifdef CONFIG_MM_SLICES 693#ifdef CONFIG_PPC_MM_SLICES
694 struct hstate *hstate = hstate_file(file); 694 struct hstate *hstate = hstate_file(file);
695 int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate)); 695 int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate));
696 696
@@ -702,7 +702,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
702 702
703unsigned long vma_mmu_pagesize(struct vm_area_struct *vma) 703unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
704{ 704{
705#ifdef CONFIG_MM_SLICES 705#ifdef CONFIG_PPC_MM_SLICES
706 unsigned int psize = get_slice_psize(vma->vm_mm, vma->vm_start); 706 unsigned int psize = get_slice_psize(vma->vm_mm, vma->vm_start);
707 707
708 return 1UL << mmu_psize_to_shift(psize); 708 return 1UL << mmu_psize_to_shift(psize);