[PATCH OLK-6.6 06/31] fix conflit with 41e1eb2546e9c8200d32f11e4b47d86d156a5a97("iommu/io-pgtable-arm: Prepare PTE methods for handling multiple entries")

Signed-off-by: jiaqingtong jiaqingtong@huawei.com --- drivers/iommu/io-pgtable-arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 8b4ce1a6b511..2967d9f836a6 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -862,14 +862,14 @@ static size_t __arm_lpae_merge_page(struct arm_lpae_io_pgtable *data, /* Race does not exist */ if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_BBML1) { prot |= ARM_LPAE_PTE_NT; - __arm_lpae_init_pte(data, paddr, prot, lvl, ptep); + __arm_lpae_init_pte(data, paddr, prot, lvl, 1, ptep); io_pgtable_tlb_flush_walk(iop, iova, size, ARM_LPAE_GRANULE(data));

prot &= ~(ARM_LPAE_PTE_NT); - __arm_lpae_init_pte(data, paddr, prot, lvl, ptep); + __arm_lpae_init_pte(data, paddr, prot, lvl, 1, ptep); } else { - __arm_lpae_init_pte(data, paddr, prot, lvl, ptep); + __arm_lpae_init_pte(data, paddr, prot, lvl, 1, ptep); }

tablep = iopte_deref(pte, data);