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

Commit 7faccb78 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/io-pgtable-arm: Stricter double-map checking"

parents 1dbc1b8d e441d56a

drivers/iommu/io-pgtable-arm.c

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, 
	arm_lpae_iopte pte = prot;



	/* We require an unmap first */

	if (iopte_leaf(*ptep, lvl)) {

		WARN_ON(!suppress_map_failures);

	if (*ptep & ARM_LPAE_PTE_VALID) {

		BUG_ON(!suppress_map_failures);

		return -EEXIST;

	}