Commit 87dedf7c authored May 27, 2019 by Anshuman Khandual Committed by Catalin Marinas Jun 04, 2019

arm64/mm: Change BUG_ON() to VM_BUG_ON() in [pmd|pud]_set_huge()

There are no callers for the functions which will pass unaligned physical
addresses. Hence just change these BUG_ON() checks into VM_BUG_ON() which
gets compiled out unless CONFIG_VM_DEBUG is enabled.

Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent 2e6aee5a

arch/arm64/mm/mmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -978,7 +978,7 @@ int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot)
		pud_val(new_pud)))
		return 0;

		BUG_ON(phys & ~PUD_MASK);
		VM_BUG_ON(phys & ~PUD_MASK);
		set_pud(pudp, new_pud);
		return 1;
		}
		@@ -992,7 +992,7 @@ int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgprot_t prot)
		pmd_val(new_pmd)))
		return 0;

		BUG_ON(phys & ~PMD_MASK);
		VM_BUG_ON(phys & ~PMD_MASK);
		set_pmd(pmdp, new_pmd);
		return 1;
		}

Admin message