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

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

Merge "iommu: Provide dummy entries for DOMAIN_ATTR_ATOMIC"

parents 0c89179c 011adb98

drivers/iommu/msm_iommu-v1.c

+6 −0
Original line number Diff line number Diff line
@@ -1832,6 +1832,12 @@ static int msm_iommu_domain_set_attr(struct iommu_domain *domain, 
		 * is not dynamic in this driver.

		 */

		break;

	case DOMAIN_ATTR_ATOMIC:

		/*

		 * Map / unmap in legacy driver are by default atomic. So

		 * we don't need to do anything here.

		 */

		break;

	default:

		return -EINVAL;

	}

drivers/iommu/msm_iommu_sec.c

+6 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,12 @@ static int msm_iommu_domain_set_attr(struct iommu_domain *domain, 
		 * any domain.

		 */

		break;

	case DOMAIN_ATTR_ATOMIC:

		/*

		 * Map / unmap in legacy driver are by default atomic. So

		 * we don't need to do anything here.

		 */

		break;

	default:

		return -EINVAL;

	}