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

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

Merge "iommu: interchange the vmid order passed to hyp_assign"

parents 202f8161 87884961

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2451,7 +2451,7 @@ static void arm_smmu_unassign_table(struct arm_smmu_domain *smmu_domain) 
	int ret;

	int dest_vmids = VMID_HLOS;

	int dest_perms = PERM_READ | PERM_WRITE | PERM_EXEC;

	int source_vmlist[2] = {VMID_HLOS, smmu_domain->secure_vmid};

	int source_vmlist[2] = {smmu_domain->secure_vmid, VMID_HLOS};

	struct arm_smmu_pte_info *pte_info, *temp;



	if (!arm_smmu_is_master_side_secure(smmu_domain))