Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753280AbdGMVRA (ORCPT ); Thu, 13 Jul 2017 17:17:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57256 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752670AbdGMVPh (ORCPT ); Thu, 13 Jul 2017 17:15:37 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CE4EF7CE16 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jglisse@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CE4EF7CE16 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: John Hubbard , David Nellans , Dan Williams , Balbir Singh , Michal Hocko , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Ross Zwisler Subject: [PATCH 1/6] mm/zone-device: rename DEVICE_PUBLIC to DEVICE_HOST Date: Thu, 13 Jul 2017 17:15:27 -0400 Message-Id: <20170713211532.970-2-jglisse@redhat.com> In-Reply-To: <20170713211532.970-1-jglisse@redhat.com> References: <20170713211532.970-1-jglisse@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 13 Jul 2017 21:15:37 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1991 Lines: 53 Existing user of ZONE_DEVICE in its DEVICE_PUBLIC variant are not tie to specific device and behave more like host memory. This patch rename DEVICE_PUBLIC to DEVICE_HOST and free the name DEVICE_PUBLIC to be use for cache coherent device memory that has strong tie with the device on which the memory is (for instance on board GPU memory). There is no functional change here. Signed-off-by: Jérôme Glisse Cc: Dan Williams Cc: Ross Zwisler --- include/linux/memremap.h | 4 ++-- kernel/memremap.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 57546a07a558..ae5ff92f72b4 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -41,7 +41,7 @@ static inline struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start) * Specialize ZONE_DEVICE memory into multiple types each having differents * usage. * - * MEMORY_DEVICE_PUBLIC: + * MEMORY_DEVICE_HOST: * Persistent device memory (pmem): struct page might be allocated in different * memory and architecture might want to perform special actions. It is similar * to regular memory, in that the CPU can access it transparently. However, @@ -59,7 +59,7 @@ static inline struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start) * include/linux/hmm.h and Documentation/vm/hmm.txt. */ enum memory_type { - MEMORY_DEVICE_PUBLIC = 0, + MEMORY_DEVICE_HOST = 0, MEMORY_DEVICE_PRIVATE, }; diff --git a/kernel/memremap.c b/kernel/memremap.c index b9baa6c07918..4e07525aa273 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -350,7 +350,7 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, } pgmap->ref = ref; pgmap->res = &page_map->res; - pgmap->type = MEMORY_DEVICE_PUBLIC; + pgmap->type = MEMORY_DEVICE_HOST; pgmap->page_fault = NULL; pgmap->page_free = NULL; pgmap->data = NULL; -- 2.13.0