Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp829089imu; Tue, 11 Dec 2018 08:11:59 -0800 (PST) X-Google-Smtp-Source: AFSGD/XOoKh/kSPCP6jqbnL2uSB2LcixcmkM/MnV9wAjJUNyrdrD+OvrkmEuMWgwgOUdO3MU+gzq X-Received: by 2002:a63:413:: with SMTP id 19mr14919206pge.7.1544544719758; Tue, 11 Dec 2018 08:11:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544544719; cv=none; d=google.com; s=arc-20160816; b=eLXXvgXF1wJIVT/s92cBxz9YDz60odsfdFpIMz7y9AOIOgx98H5EzBj2fXTzLXjSDI dZnGqE4R29QpM86bAmlH7xMFxyje22m1RdS+UB8Lydi9/faCsK/pLb6AOSXVgGt4DHSv X5rSe3GrzuiQ9IMC7vS8TVHepJTFJ6kZp5bMv1wpWh/obUSQ6NjS5BB4ZDYksX3X+5e3 MyXea1S8ge18+SAI+8hM3/pIY1OzZQrSG/sbbdIZNc+uXOGC3es+dtEyyOcEM691Iogv jdrgEHJ8zaP8kUbgAiMBP2MoHcaeoK0nUA4bUEiK0B7geOzKXE3bNlyGccvo5MfQw7Rk DDig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ggCn0ZQDegsAb0Kntb5TpoH4/gYs+bF/Tk7uFmzDyYs=; b=hjaIX0xuQv9r6K2hAPW30vSXa6BuaF+KJRT95rJNA+te4Gs6Sb6/lSCwYCNw+MFBMW 3BpQjFRHZCalZjwST89FYpmz60PpE6hFtKhbA6qEg+6Zc/eoR/+Jk+K8cEbwMIFVsPUJ ADarZ/7sd6zds9hKmUUX4Vk9eNs1JpuSeX9ZDzOnb1wXTBX96Nax2yvkMNhW19y0gWHH pNRww0wXQ/Z36dCvWpqulk6g8boizD5uDcIdAfdXetTqA4GRG662YtGz+OxXepmGngij 4Y+HBUNBpNKM1R6IL2+QEmquLDLelKjAzn4Z14NPxZriVRUXcsCwIh762NjgAaZ9KgIo SVbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ylpTX1eO; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k17si12444850pgl.62.2018.12.11.08.11.44; Tue, 11 Dec 2018 08:11:59 -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=ylpTX1eO; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729599AbeLKPvv (ORCPT + 99 others); Tue, 11 Dec 2018 10:51:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:40524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728815AbeLKPvu (ORCPT ); Tue, 11 Dec 2018 10:51:50 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F1302084E; Tue, 11 Dec 2018 15:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543509; bh=V0GYWbTHsDivVqu4NGm9It4+OSUKyh2tynjczkVjM5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ylpTX1eOQ6LIz7lLGbYTw1vZQrJ0SJZpE2MsMAdsCEeZwTYkoHxeNdpdq+58LeMnO ACtfD72heBnL4+7egq8K42/2outlX+Hvts0rsPHn7i1AMVNx6CxB1hgVJmSLxdn3/C 2eDehvjggWgx2KkTKNPgEh/TF+5zYHWZXiGN1610= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , Joerg Roedel , Sasha Levin Subject: [PATCH 4.14 25/67] iommu/vt-d: Use memunmap to free memremap Date: Tue, 11 Dec 2018 16:41:25 +0100 Message-Id: <20181211151631.675949181@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151630.378216233@linuxfoundation.org> References: <20181211151630.378216233@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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.19.1