From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbdGCVOc (ORCPT ); Mon, 3 Jul 2017 17:14:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39190 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752234AbdGCVOZ (ORCPT ); Mon, 3 Jul 2017 17:14:25 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3B482C0587DE Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jglisse@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3B482C0587DE 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 , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Ross Zwisler Subject: [PATCH 1/5] mm/persistent-memory: match IORES_DESC name and enum memory_type one Date: Mon, 3 Jul 2017 17:14:11 -0400 Message-Id: <20170703211415.11283-2-jglisse@redhat.com> In-Reply-To: <20170703211415.11283-1-jglisse@redhat.com> References: <20170703211415.11283-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.32]); Mon, 03 Jul 2017 21:14:24 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use consistent name between IORES_DESC and enum memory_type, rename MEMORY_DEVICE_PUBLIC to MEMORY_DEVICE_PERSISTENT. This is to free up the public name for CDM (cache coherent device memory) for which the term public is a better match. 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..2299cc2d387d 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_PERSISTENT: * 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_PERSISTENT = 0, MEMORY_DEVICE_PRIVATE, }; diff --git a/kernel/memremap.c b/kernel/memremap.c index b9baa6c07918..e82456c39a6a 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_PERSISTENT; pgmap->page_fault = NULL; pgmap->page_free = NULL; pgmap->data = NULL; -- 2.13.0