Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp301761img; Wed, 20 Mar 2019 00:38:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCOFCt09Ox1+LuDeOwi55UfJUjXgyI6DaUH859Ii5pTu5XL/oAJ3uQqbFYmfsIp3X9JC9F X-Received: by 2002:a62:7603:: with SMTP id r3mr6235313pfc.32.1553067493552; Wed, 20 Mar 2019 00:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553067493; cv=none; d=google.com; s=arc-20160816; b=BQdayKa7EA4uUTSOtT0e31OtsZCqlKGV8WtptAm3R7OnuvVQ5IDhtVYswDjNlZpse8 mz6ZsozQ3VQP5EL2azqWC9pTn7TUEVK+RNUhJxNwVP/19cpVtgCqBd0P//W6W/rG8hSa CbRwaH0IthAwBRY++VGtYrE8iBOEEuyttM1OJx4vKytle3XG+S2g0MbsQ4iFRddXZfbB Epiv/RNINPaXSCdwaY/lgNIBLDqagsxBx8i3IjPTbVEDELRVp++URWven/3vN9QpW8+T +chew2gG322MRZ5xeJ33YqOZJdRu5zcG8SJP/8ZYpRZTpx01U3x8Wrk0xGC23YI5dc62 lqYw== 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; bh=NHYm78XeumLt8ir9csQDBL74SYZAX+2NrnzQ7Es7qeA=; b=ny9gswouxGV566aWfsm0GGsp/2TwSgRTCXjqmu+ImPJjM7IHTzNrKIJKK64m6MTOk5 8B+xy/y8Rk1QxqI2LQbF9U8ZJk2DvahDGiOEfca0JYuJe8JnsouNhCxRYC7xQ6xHTzRO 1gGrQB4J3yM9Sc89EiyQPFPWu/z1ofHYfsYWn+Yq8V1LS7IkvPQMTD39OD5jlz8EnqJL NIoQ73iLzgwOAIiR86T0pM0qRrCf8QN8UC5oTYDN4EDX/Mv3YSO1d56yK3gE+/NxD8rv Vx/NIbz9UXJqYeEbOPkdmdEejRnbb/h/6LJ4s0VRSk1PSEKv5IHZGg9b346w0r3quEbF ZN/A== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q11si994779pgh.548.2019.03.20.00.37.57; Wed, 20 Mar 2019 00:38:13 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727596AbfCTHgG (ORCPT + 99 others); Wed, 20 Mar 2019 03:36:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60020 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726303AbfCTHgF (ORCPT ); Wed, 20 Mar 2019 03:36:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 824A5307D981; Wed, 20 Mar 2019 07:36:05 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-38.pek2.redhat.com [10.72.12.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8178F60BF3; Wed, 20 Mar 2019 07:36:00 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, pasha.tatashin@oracle.com, mhocko@suse.com, rppt@linux.vnet.ibm.com, richard.weiyang@gmail.com, linux-mm@kvack.org, Baoquan He Subject: [PATCH 3/3] mm/sparse: Rename function related to section memmap allocation/free Date: Wed, 20 Mar 2019 15:35:40 +0800 Message-Id: <20190320073540.12866-3-bhe@redhat.com> In-Reply-To: <20190320073540.12866-1-bhe@redhat.com> References: <20190320073540.12866-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 20 Mar 2019 07:36:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These functions are used allocate/free section memmap, have nothing to do with kmalloc/free during the handling. Rename them to remove the confusion. Signed-off-by: Baoquan He --- mm/sparse.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 054b99f74181..374206212d01 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -579,13 +579,13 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn) #endif #ifdef CONFIG_SPARSEMEM_VMEMMAP -static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid, +static inline struct page *alloc_section_memmap(unsigned long pnum, int nid, struct vmem_altmap *altmap) { /* This will make the necessary allocations eventually. */ return sparse_mem_map_populate(pnum, nid, altmap); } -static void __kfree_section_memmap(struct page *memmap, +static void __free_section_memmap(struct page *memmap, struct vmem_altmap *altmap) { unsigned long start = (unsigned long)memmap; @@ -603,7 +603,7 @@ static void free_map_bootmem(struct page *memmap) } #endif /* CONFIG_MEMORY_HOTREMOVE */ #else -static struct page *__kmalloc_section_memmap(void) +static struct page *__alloc_section_memmap(void) { struct page *page, *ret; unsigned long memmap_size = sizeof(struct page) * PAGES_PER_SECTION; @@ -624,13 +624,13 @@ static struct page *__kmalloc_section_memmap(void) return ret; } -static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid, +static inline struct page *alloc_section_memmap(unsigned long pnum, int nid, struct vmem_altmap *altmap) { - return __kmalloc_section_memmap(); + return __alloc_section_memmap(); } -static void __kfree_section_memmap(struct page *memmap, +static void __free_section_memmap(struct page *memmap, struct vmem_altmap *altmap) { if (is_vmalloc_addr(memmap)) @@ -701,7 +701,7 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn, usemap = __kmalloc_section_usemap(); if (!usemap) return -ENOMEM; - memmap = kmalloc_section_memmap(section_nr, nid, altmap); + memmap = alloc_section_memmap(section_nr, nid, altmap); if (!memmap) { kfree(usemap); return -ENOMEM; @@ -726,7 +726,7 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn, out: if (ret < 0) { kfree(usemap); - __kfree_section_memmap(memmap, altmap); + __free_section_memmap(memmap, altmap); } return ret; } @@ -777,7 +777,7 @@ static void free_section_usemap(struct page *memmap, unsigned long *usemap, if (PageSlab(usemap_page) || PageCompound(usemap_page)) { kfree(usemap); if (memmap) - __kfree_section_memmap(memmap, altmap); + __free_section_memmap(memmap, altmap); return; } -- 2.17.2