Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp7199735imm; Tue, 28 Aug 2018 08:00:11 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYyHT9zoIroBbHpP0bUyB2CxKTv+cL18oQg6eWXY9H8nJmKVpHMFkzLMpTKuI+Sb6NJgiyH X-Received: by 2002:a63:d401:: with SMTP id a1-v6mr1936456pgh.414.1535468411633; Tue, 28 Aug 2018 08:00:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535468411; cv=none; d=google.com; s=arc-20160816; b=p4lmhTMyONz2gLnxdRcGNjqIuIZpXuNGKUgPfYupiWoqOqUsRbGL+EXx3zRBbLtw/+ Lg2Av1rFiswKjVNlOERBLkCR40FX5BGiA9yWzWIxY+IIIrkXw036VG+6kBzsElOMilOR 43U0VxCpRUqZAmHF2BZLtucdDa0eVQEZEKGSFDXCVdG6rQ9n719WgeoFJF2YzQoHPBHN Bi1bAxDJrRrmSAkolihwx4S3hUChhpGn9907iO/z97n9o+y7OEvTJ0Tp88h/JziFS3fL BiUs4pkU2SoqpdIfCB67OFoCxvv2/aQ/5UVeaWtGh3CauWF4vdiJ8Fni9mJEfFTD2fNS JIPw== 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:arc-authentication-results; bh=yIwb6uEk5/hv3Tvm4Xff2KDOLO6LMMPMM9lI85j8icw=; b=RosOjP0BTSCdODcd17tQvgj12fl0PZkkeXJkFCPPganYkoBf5dYV1qqzJKzkm6WmdX H6Fg5HqzB7krwl0SOVJzXS8EsRcHfhdFbH4RmJyQPgdWU7tN/CvQonCFlvgO2G3CdoM9 Cb66N77Po9NdOBw/bfnAZEZdhxcCc7iYCaArUA4lDvd8hfThtYL3Lss+w048IhUxq4x4 /k/A1h+gKvfW1ILgMUoBBYY/k5tVocWtZEQSjOLOcAbik6jdsWoqo06SZGuoNl64hkY4 yZTfpZsQWFiLYaQdTpRI1fGTR+YRcMKw8FshCmoTieJGTDRsmsBdg/QE7qGlo8SFJ6T0 +FAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=jdK7t+GJ; 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 1-v6si1105584plz.220.2018.08.28.07.59.56; Tue, 28 Aug 2018 08:00:11 -0700 (PDT) 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=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=jdK7t+GJ; 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 S1728447AbeH1SuQ (ORCPT + 99 others); Tue, 28 Aug 2018 14:50:16 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:57666 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728475AbeH1Sto (ORCPT ); Tue, 28 Aug 2018 14:49:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=yIwb6uEk5/hv3Tvm4Xff2KDOLO6LMMPMM9lI85j8icw=; b=jdK7t+GJO9QxRmlulZaY5yL/W OdR3fcQJKAtlhRmv5uVYKENCdMZbmVFAny4B1K51WA1i0sI/Yn7KEV9G+H93xvEzgwvL/B6KUCPVI /+nXfAIcAKWgJnMOG5i2nRBz/V2Kz6Zc920fR+886fWGd+Qu7+sKLDhfSVFP7Vf4xgkhXvgLF2ND1 XGgy7/e7rciYG6915eCcateQmg42qd/7s6MtJNs0vjeZPLjlNH7eZlDQAmfCLIS5z2tvWfogIx4TX LrVEy2yxzm0+51aPCOBM0EPUXXWwQiD0PxT/Itcs/5+fAtVjDinGzVGXs7L9bMWTF5sIy71VvMO4W qkyTiFWBA==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fufR6-0003Bz-1X; Tue, 28 Aug 2018 14:57:40 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , Nicolas Pitre , Souptick Joarder , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] mm: Remove references to vm_insert_pfn Date: Tue, 28 Aug 2018 07:57:24 -0700 Message-Id: <20180828145728.11873-7-willy@infradead.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180828145728.11873-1-willy@infradead.org> References: <20180828145728.11873-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Documentation and comments. Signed-off-by: Matthew Wilcox --- Documentation/x86/pat.txt | 4 ++-- include/asm-generic/pgtable.h | 4 ++-- include/linux/hmm.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt index 2a4ee6302122..481d8d8536ac 100644 --- a/Documentation/x86/pat.txt +++ b/Documentation/x86/pat.txt @@ -90,12 +90,12 @@ pci proc | -- | -- | WC | Advanced APIs for drivers ------------------------- A. Exporting pages to users with remap_pfn_range, io_remap_pfn_range, -vm_insert_pfn +vmf_insert_pfn Drivers wanting to export some pages to userspace do it by using mmap interface and a combination of 1) pgprot_noncached() -2) io_remap_pfn_range() or remap_pfn_range() or vm_insert_pfn() +2) io_remap_pfn_range() or remap_pfn_range() or vmf_insert_pfn() With PAT support, a new API pgprot_writecombine is being added. So, drivers can continue to use the above sequence, with either pgprot_noncached() or diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 88ebc6102c7c..5657a20e0c59 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -757,7 +757,7 @@ static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd) /* * Interfaces that can be used by architecture code to keep track of * memory type of pfn mappings specified by the remap_pfn_range, - * vm_insert_pfn. + * vmf_insert_pfn. */ /* @@ -773,7 +773,7 @@ static inline int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, /* * track_pfn_insert is called when a _new_ single pfn is established - * by vm_insert_pfn(). + * by vmf_insert_pfn(). */ static inline void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pfn) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index 4c92e3ba3e16..dde947083d4e 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -107,7 +107,7 @@ enum hmm_pfn_flag_e { * HMM_PFN_ERROR: corresponding CPU page table entry points to poisoned memory * HMM_PFN_NONE: corresponding CPU page table entry is pte_none() * HMM_PFN_SPECIAL: corresponding CPU page table entry is special; i.e., the - * result of vm_insert_pfn() or vm_insert_page(). Therefore, it should not + * result of vmf_insert_pfn() or vm_insert_page(). Therefore, it should not * be mirrored by a device, because the entry will never have HMM_PFN_VALID * set and the pfn value is undefined. * -- 2.18.0