Commit c045c72c authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds
Browse files

mm/pgtable-generic.c: simplify the VM_BUG_ON condition in pmdp_huge_clear_flush() 

The condition (A && !C && !D) || !A is equivalent to !A || (A && !C && !D)
and can be further simplified to !A || (!C && !D).

Link: https://lkml.kernel.org/r/20210201114319.34720-1-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 90a3e375

mm/pgtable-generic.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma, unsigned long address, 
{

	pmd_t pmd;

	VM_BUG_ON(address & ~HPAGE_PMD_MASK);

	VM_BUG_ON((pmd_present(*pmdp) && !pmd_trans_huge(*pmdp) &&

			   !pmd_devmap(*pmdp)) || !pmd_present(*pmdp));

	VM_BUG_ON(!pmd_present(*pmdp) || (!pmd_trans_huge(*pmdp) &&

					  !pmd_devmap(*pmdp)));

	pmd = pmdp_huge_get_and_clear(vma->vm_mm, address, pmdp);

	flush_pmd_tlb_range(vma, address, address + HPAGE_PMD_SIZE);

	return pmd;