Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2081377imu; Wed, 28 Nov 2018 22:03:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/VYRdlY05eMyH1V2k9A61dx8r4o7WZRsHFAvhSAOziYxt8HOf8GwAzC2Qk9zRipNllsqBSG X-Received: by 2002:a63:62c3:: with SMTP id w186mr149854pgb.345.1543471382685; Wed, 28 Nov 2018 22:03:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543471382; cv=none; d=google.com; s=arc-20160816; b=pMpFZ7yP+q6UGhgdO8fxbob5YxlpcybhgIxvIIP8AnwwHxiRO1XS4tjqkCBYoz9MB1 vlBzSmQEpC9awOHEj8oeKgoKrD4pT9DQqFREdeXwzasWobUDO1+1PFnGM4YWSlVT9PKM lhOCM1U04j6Tw911W3+PLt+RRtgqNBFuUhdQkdoGqJASyw3rDmBPWSPRlL9C2wlSMFDE mX3jrfdWsMZWIdGqvNMOFv+htoqlfpuBaAPKuFEnPmItWQP1ciepx++a94W+bBLfkOC+ bbUoEfrp+1HMc2lwD2Pv02dH30zUAHhApaUGcNY3k+Hs4PXeQrElQvJY25exwK9SOfOy Ijeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=VUPvPPqwITeDPvP/XEqRZPGSKC2KN/vfWh4K+ySjqME=; b=vCd4VLIzoIU8F0DIGjhU3AMqIyu0no65wsiWWpG+9HodJrM7+B+/l0SrIGLA45S4tL B8Gs3ZB5bgWfR0gW6+2oQrE0KpCKjF+a1Dpg2IliJTRXGP9ROQ9F9Vw+t6HusPAET3RB 72pYUVUtMGNVwHhzeDnjtN4yMo4JaXgQVx1j0vTMO9xc19vkcF1F42OZUbIFSefSblxj iKPMsZJ5fKrCeBwJadMTD1SFMyPTpDWvbefb7fzs1n4teK0YzoE0Y3iROZRpKvT0dcu1 I5XTJ7r1jwqgioYbw3z7pDk5kqGTlAJSXlDqYiMjr6Cj6DeZtUjZ5eDbzQuY5TrN2SJZ +1LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pXNK5H5g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d185-v6si1015734pfc.256.2018.11.28.22.02.48; Wed, 28 Nov 2018 22:03:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pXNK5H5g; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729134AbeK2REb (ORCPT + 99 others); Thu, 29 Nov 2018 12:04:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:39260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727570AbeK2REa (ORCPT ); Thu, 29 Nov 2018 12:04:30 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CCB72208E7; Thu, 29 Nov 2018 06:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543471219; bh=0Z09t9aazc65LnsxHX6m7kGgqsXPzSYdzhQNmNjkAbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pXNK5H5g/s5u4ja0hyXgHscRdN9lin5tUfOoAbO4UtUVsLHlor8WRKVAVghSxBdsx hCMQFoTSxMkS9lKZr7YJVBUR0vkWBL98Gq2qwEYplNky/9Einmd+UxJcX4KV67s42/ RxysJMqVLlGx7hzp/cXIKM472gwISBSKtcs8W4po= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Pan Bian , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.19 56/68] iommu/vt-d: Use memunmap to free memremap Date: Thu, 29 Nov 2018 00:55:47 -0500 Message-Id: <20181129055559.159228-56-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129055559.159228-1-sashal@kernel.org> References: <20181129055559.159228-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pan Bian [ Upstream commit 829383e183728dec7ed9150b949cd6de64127809 ] memunmap() should be used to free the return of memremap(), not iounmap(). Fixes: dfddb969edf0 ('iommu/vt-d: Switch from ioremap_cache to memremap') Signed-off-by: Pan Bian Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/intel-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index bedc801b06a0..a76c47f20587 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3100,7 +3100,7 @@ static int copy_context_table(struct intel_iommu *iommu, } if (old_ce) - iounmap(old_ce); + memunmap(old_ce); ret = 0; if (devfn < 0x80) -- 2.17.1