From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 365D2C07E85 for ; Tue, 11 Dec 2018 15:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEF372145D for ; Tue, 11 Dec 2018 15:49:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543353; bh=78cyAjy9s3Kgf/n10tvgRctZ3kXVcR6emcLgJFvEy/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wAf2HSg8LqIMoeu2mPP96zbWcA0wQL9QuHza0gcQXWht/Z8WdFiXaNJ9UrOg79V9a IYN8pL54jfeXHg7fjdw1X4LoCuG4sjCsUW//oBC7UgisEsVkE7/utlfCIPYUkLc3SU 8hhuEP+jaQG0yNHmawGUDyqYidPJ3WVvL/UUOAyE= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEF372145D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbeLKPtL (ORCPT ); Tue, 11 Dec 2018 10:49:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:37472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728176AbeLKPtH (ORCPT ); Tue, 11 Dec 2018 10:49:07 -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 8DD9F20870; Tue, 11 Dec 2018 15:49:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543347; bh=78cyAjy9s3Kgf/n10tvgRctZ3kXVcR6emcLgJFvEy/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izCsrkuarTbBPyKS47dggbCUwzzSUBOUzC4RjSn9fGMCOwqiq3MvsSoQypsiCW2Ul NcE326rgICzPPZKisex1rfEZ+RlpxnzgiaYEmCxC75Y9xE61DRP4dfWA9zF6ewBnA5 xFiLIRL/b3/e221PFBQmiAhqtpZVQbPPOmcYWWrA= 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.9 16/51] iommu/vt-d: Use memunmap to free memremap Date: Tue, 11 Dec 2018 16:41:24 +0100 Message-Id: <20181211151614.290009891@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151612.328911565@linuxfoundation.org> References: <20181211151612.328911565@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.9-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 2558a381e118..f8c8537f0587 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3054,7 +3054,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