Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67730272 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/mm/radix: Drop unneeded NULL check 



We call these functions with non-NULL mm or vma. Hence we can skip the
NULL check in these functions. We also remove now unused function
__local_flush_hugetlb_page().

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[mpe: Drop the checks with is_vm_hugetlb_page() as noticed by Nick]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 402e172a

arch/powerpc/include/asm/hugetlb.h

+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ static inline void flush_hugetlb_page(struct vm_area_struct *vma, 
		return radix__flush_hugetlb_page(vma, vmaddr);

}



static inline void __local_flush_hugetlb_page(struct vm_area_struct *vma,

					      unsigned long vmaddr)

{

	if (radix_enabled())

		return radix__local_flush_hugetlb_page(vma, vmaddr);

}

#else



static inline pte_t *hugepd_page(hugepd_t hpd)

arch/powerpc/mm/tlb-radix.c

+10 −12
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void radix__local_flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmadd 
	unsigned long ap = mmu_get_ap(psize);



	preempt_disable();

	pid = mm ? mm->context.id : 0;

	pid = mm->context.id;

	if (pid != MMU_NO_CONTEXT)

		_tlbiel_va(vmaddr, pid, ap, RIC_FLUSH_TLB);

	preempt_enable();
@@ -174,11 +174,10 @@ void radix__local_flush_tlb_page(struct vm_area_struct *vma, unsigned long vmadd 
{

#ifdef CONFIG_HUGETLB_PAGE

	/* need the return fix for nohash.c */

	if (vma && is_vm_hugetlb_page(vma))

		return __local_flush_hugetlb_page(vma, vmaddr);

	if (is_vm_hugetlb_page(vma))

		return radix__local_flush_hugetlb_page(vma, vmaddr);

#endif

	radix__local_flush_tlb_page_psize(vma ? vma->vm_mm : NULL, vmaddr,

					  mmu_virtual_psize);

	radix__local_flush_tlb_page_psize(vma->vm_mm, vmaddr, mmu_virtual_psize);

}

EXPORT_SYMBOL(radix__local_flush_tlb_page);
@@ -232,7 +231,7 @@ void radix__flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmaddr, 
	unsigned long ap = mmu_get_ap(psize);



	preempt_disable();

	pid = mm ? mm->context.id : 0;

	pid = mm->context.id;

	if (unlikely(pid == MMU_NO_CONTEXT))

		goto bail;

	if (!mm_is_thread_local(mm))
@@ -246,11 +245,10 @@ void radix__flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmaddr, 
void radix__flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)

{

#ifdef CONFIG_HUGETLB_PAGE

	if (vma && is_vm_hugetlb_page(vma))

		return flush_hugetlb_page(vma, vmaddr);

	if (is_vm_hugetlb_page(vma))

		return radix__flush_hugetlb_page(vma, vmaddr);

#endif

	radix__flush_tlb_page_psize(vma ? vma->vm_mm : NULL, vmaddr,

				    mmu_virtual_psize);

	radix__flush_tlb_page_psize(vma->vm_mm, vmaddr, mmu_virtual_psize);

}

EXPORT_SYMBOL(radix__flush_tlb_page);
@@ -330,7 +328,7 @@ void radix__flush_tlb_range_psize(struct mm_struct *mm, unsigned long start, 




	preempt_disable();

	pid = mm ? mm->context.id : 0;

	pid = mm->context.id;

	if (unlikely(pid == MMU_NO_CONTEXT))

		goto err_out;
@@ -361,7 +359,7 @@ void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr) 
	unsigned long pid, end;





	pid = mm ? mm->context.id : 0;

	pid = mm->context.id;

	if (unlikely(pid == MMU_NO_CONTEXT))

		goto no_context;