Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2083341imu; Wed, 28 Nov 2018 22:05:28 -0800 (PST) X-Google-Smtp-Source: AFSGD/UU1UJCJ2Fc1qR7Bn0Z/ICtX9O2oOaZEDX/Tut7g9he+0dOXTSU+T08BnKCInFRgZXkUGCJ X-Received: by 2002:a17:902:3064:: with SMTP id u91mr184509plb.325.1543471528462; Wed, 28 Nov 2018 22:05:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543471528; cv=none; d=google.com; s=arc-20160816; b=dosNGFOZYYCcRBh0sZrsGW4nnXOI78velIOhVMmxIguR8rL66C3q5ZcnJqzug1VObo 9PvwejMxmOACzSl4cw4h+by4PwrWFX9P9opNL7vtJsp1d/c3YAAzf4/mvZ2uym8QKWsG qvDseQr/MPc/l/wUTHg5EsmE1/c+pYJ0BowjDEf0kWZigXJ9PU/2KPs0Q/+JJMFs9GbU yXld53+5LkVR25xTDm8zC9NW3rS6DigkNXI+psjI2R3HghYilOuNSXdvzTjRFe1aCpeT qRQPzqvjh19kmpEcU7pgDGvNo9+GAQ9ywIfxRTw7P9f+AuV9W4XPW95XN7lT7ycPBrWM IPGA== 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=wsW5y5fRS5eN77gfxomin1N9d4ZrXiyHitA2NtDNxU0=; b=tvImgNHzReIPqw0Jj1tL5JBtUTCs8Sj1FLvE9Q9bQH7K3ABsg6tYBB9NO5I23Hfw6I t79adZf3LJWr0KtPUbacqpdSeyM3dj97bLGEd2fPtheY7pX7OvVMUYgny533KVjbu7V6 lGNhSnXp2/TESK3vxO9EIUAPzfHAA8isSRWcozEZaBLNFabjwQs2v+ohuO3cPdRdpu7n su7OiiNXDr5/bikVZ7p0b3ar6TCWgaiHjFd6bw/Jzje5P2DS0Tx2EEy41wgtt1HacPC8 hiO1BLalWD84pca5FygEQSf3o0FC1dLMwPgWjy2XtIQ8guwqMorSBsjm7sicAodtkRSU mKXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kdVu1euQ; 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 b24si1054383pgg.288.2018.11.28.22.05.13; Wed, 28 Nov 2018 22:05:28 -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=kdVu1euQ; 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 S1729794AbeK2RHF (ORCPT + 99 others); Thu, 29 Nov 2018 12:07:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:44070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728459AbeK2RHF (ORCPT ); Thu, 29 Nov 2018 12:07:05 -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 86B20213A2; Thu, 29 Nov 2018 06:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543471373; bh=MCHUrcVh/9wNKvBfluNkKqAAPwXRnq+EKY7eeyi3tuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kdVu1euQRdltdXgkmymfTLkAI3u+rxAC92pRMrNMGHhjOw4kvzmYk3y5jxMjLFquR 8YbJIa5THANlbqznNVkoMnRe9V/QtlxQaJ+Ob+f462l21Dp5U101Iq2cV1S2KkJxT0 jG3oZD/urT3qM3z/QGUL/a8TL12gDCIqDdrXUNy8= 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.14 27/35] iommu/vt-d: Use memunmap to free memremap Date: Thu, 29 Nov 2018 01:01:01 -0500 Message-Id: <20181129060110.159878-27-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129060110.159878-1-sashal@kernel.org> References: <20181129060110.159878-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 aaf3fed97477..e86c1c8ec7f6 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3086,7 +3086,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