Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp810639imu; Tue, 11 Dec 2018 07:57:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/UZ9Lrr13RtqjJ+yFfkIXHR/dqlJUP70de8hYcjpL+hyv+vR3ZFEqGXkfX/jrgnxVYQv0Hb X-Received: by 2002:a17:902:4124:: with SMTP id e33mr16482570pld.236.1544543860431; Tue, 11 Dec 2018 07:57:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544543860; cv=none; d=google.com; s=arc-20160816; b=LB3C9V+OrUUfV7xjyQyBFO9EwM6A1gLrYK2FFR/vl90s+WoYNx3gpxaj2y8ZFdjzz4 3ov/CrqQlPcTEG6K3YZTsaQfNgTCPo/bM5aqGG4V1IjvUxsL7NjsdjFOKJJW1hGZW1/b sW73mzbhW5aqU6/HhO7vYmx01SKFf6XYjV8emeRRfYXgjXeNNaC123EDODkUrNYc6Xuc bQHO8sYTTY91WwA6V5+Saa47oGuAx0E13oRt6FzppVB6aA74bGIwP7bQ34JUKVnQYkrM +u7HKSIj7x48KIKqeazQMk1KV4WLoSc3Agc9Pl1g1F275XInebl7RPIZxU/5e30Y0sGB RNtA== 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=ybcdcW/0HFiS8me60U4uLlKSPLFb2kGg0gdTQDrvSOE=; b=EMzMwwDpvUBBd5Inmqg3sTWImkZ1sp00mcN5d6gtMiXtv3GQjVIDEpHW84mMUW/LqM xBQ2mOqeHeVGTkWFIxL4HfDgJJsRJCC83yeaRU9odPHA8dypIEP5PjzESKUQy6c6oMgI BAv8n/N8PP4AXpU1zWgOG/qHHaXWy0j7RAs77zsSmuaIc3i/OFV/jTweWFIllBNQ03Rd KOcivhhHES630ggya7VqMy4AFTScdjQSqcO6NsYGGzfRUXzsti8IWJT/NCsTE7Bjsv5l cFcgiPpFlMVRM1acQtkXtVr2IX07BKPv0Bk58Dd28tbTMEHQrCxi+k6+3QAMVazrG1aO wXTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ovF3VG6G; 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 g124si11833466pgc.568.2018.12.11.07.57.26; Tue, 11 Dec 2018 07:57:40 -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=ovF3VG6G; 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 S1730466AbeLKPzv (ORCPT + 99 others); Tue, 11 Dec 2018 10:55:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:44564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730450AbeLKPzr (ORCPT ); Tue, 11 Dec 2018 10:55:47 -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 DE172208E7; Tue, 11 Dec 2018 15:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543747; bh=LIVDlbl5SuCaeuhDJlbf6yXgO6JiOdBSAykGjxBiGwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovF3VG6GOSPF6r1bsPSYemDLFUkZToIySI9FVq+2rdeHzDyGSDltDJq1anRatqb1z FmWzqWplhwuWz4G0hS52QPE68VxHVQiHBUhtw71bfvj7mKqkqW2438E8JFcDRf5biS rgsmdJxAUjqoEybwpLDqg0hcSvBonxDLYAseRZTw= 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.19 049/118] iommu/vt-d: Use memunmap to free memremap Date: Tue, 11 Dec 2018 16:41:08 +0100 Message-Id: <20181211151646.222054643@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151644.216668863@linuxfoundation.org> References: <20181211151644.216668863@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.19-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 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.19.1