Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp802091imu; Tue, 11 Dec 2018 07:49:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/WjGRIg54SnKYB66aB28avZTw4z0L4N01196Obd7NqkJl24IbMqFbv7wTjJnwM5pVgZHrCb X-Received: by 2002:a17:902:654a:: with SMTP id d10mr16182332pln.324.1544543360413; Tue, 11 Dec 2018 07:49:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544543360; cv=none; d=google.com; s=arc-20160816; b=Du6Du/n9roHNLqVioOxe/AxPEGMdUyZ/H1Vx9KtWST7ULH0v3CMzDa5URpGitvzYVB 0+T96+7BrfwjSVlvVySRj15mpdrzBkHaQgQuJjpmkLxZf5KvsElZm01B8G0H0Yv9IbEu e3X+3etlJZvjw/idJGj40YRPI2iW2bfKrC362oEyBBCPODng1gX6A0iOuc2IEyB6mHab ZQ0O82VgM6nNLb1BEqBnpKWLRsUSiQqDuJndKp3+aDGuHyDubynA3V/LvW8FnDKKOz2s P+Cn3cszg4Sjk9wZI1uSe0viSqjbr9hFstxMHfbaPIrOwgWrhCLB5KT0JxaVhTVDT6D1 qe2Q== 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=s5YZfjYiXdon+BzV/hsnZzAkcrBYJGm0GEebs73FFaE=; b=fqWiHyy7xo3p5JWpztns2ht4wsP2Hwtui9kl/sOHHaBB0cPiF0ugwBKXDR3wquysxF GZLyWbRNxuVGPdhYYte8BKNCpQb8eOecU3narqb9W/wzerm/dM0IVn2gWPNF662FO10G F7oC0O3Hw1M5QZQsx2gqdUXU5eTnB24GYh5u3AVN6/9C7owwt29DkJs5/dCdd05a7H0B zXBC59P2NjOSs0PWy6p2EKkfhz4itbhyFrnKPZmaeu0Dx7pli0rdhttXOK++tH/D3o0m q7tZMg6PsGzG9kNxVbC7GqiFK6G5HuLiQh16uVKAJPmjQnQXHG1R8MrI+8wFhnmBEDjf zCQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HGP1eRRb; 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 z8si12526486pgk.183.2018.12.11.07.49.05; Tue, 11 Dec 2018 07:49:20 -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=HGP1eRRb; 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 S1728544AbeLKPrZ (ORCPT + 99 others); Tue, 11 Dec 2018 10:47:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:35880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727835AbeLKPrX (ORCPT ); Tue, 11 Dec 2018 10:47:23 -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 DA7A8208E7; Tue, 11 Dec 2018 15:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543243; bh=4VkIYvC7imqTb/giYC1SNBh4MwUvoKH0s9iixnVPNG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGP1eRRbB+Qx02sZqRTYTXwnR+HHWW2uQyKXP8Qfqq9Uu33f2awsoWtjTSVPBlrJt NPwGkYD3cyUaEOmlscbwWBJ0xuU04butgziroEs9S98D17XWFCsk1YBnaZcWJv6a91 wb2iNmwfAT1xaSSCJg0m+ScOmja5MrLcHVHxCXoE= 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.4 68/91] iommu/vt-d: Use memunmap to free memremap Date: Tue, 11 Dec 2018 16:41:27 +0100 Message-Id: <20181211151611.871897810@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151606.026852373@linuxfoundation.org> References: <20181211151606.026852373@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.4-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 49b266433f4c..7feaa82f8c7c 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2977,7 +2977,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