From a4094253bf2fc628be1dc586f75d567750c9dfd2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 May 2021 14:21:12 +0200 Subject: [PATCH] Revert "Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single"" This reverts commit 2201384121b668d62a4a46567f9cc76cc8624eac. Bring back the commit in 5.10.35 that broke the kabi. Signed-off-by: Greg Kroah-Hartman Change-Id: I14d47f0fc68b35b08323b26eb045b5cdda845cf0 --- kernel/dma/swiotlb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 243750453b3d..b8f82f96c4c2 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -644,7 +644,6 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr, if (orig_addr == INVALID_PHYS_ADDR) return; - orig_addr += (unsigned long)tlb_addr & (IO_TLB_SIZE - 1); switch (target) { case SYNC_FOR_CPU: