From: Oscar Salvador <osalvador@suse.de>
To: akpm@linux-foundation.org
Cc: mhocko@suse.com, david@redhat.com, dan.j.williams@intel.com,
Jonathan.Cameron@huawei.com, anshuman.khandual@arm.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Oscar Salvador <osalvador@suse.de>
Subject: [PATCH 4/4] mm, sparse: rename kmalloc_section_memmap, __kfree_section_memmap
Date: Thu, 28 Mar 2019 14:43:20 +0100 [thread overview]
Message-ID: <20190328134320.13232-5-osalvador@suse.de> (raw)
In-Reply-To: <20190328134320.13232-1-osalvador@suse.de>
From: Michal Hocko <mhocko@suse.com>
The sufix "kmalloc" is misleading.
Rename it to alloc_section_memmap/free_section_memmap which
better reflects the funcionality.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Oscar Salvador <osalvador@suse.de>
---
mm/sparse.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/mm/sparse.c b/mm/sparse.c
index 82c7b119eb1d..63c1d0bd4755 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -673,13 +673,13 @@ static void deferred_vmemmap_free(unsigned long start, unsigned long end)
free_deferred_vmemmap_range(start, end);
}
-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;
@@ -723,13 +723,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();
}
-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))
@@ -794,12 +794,12 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
if (ret < 0 && ret != -EEXIST)
return ret;
ret = 0;
- memmap = kmalloc_section_memmap(section_nr, nid, altmap);
+ memmap = alloc_section_memmap(section_nr, nid, altmap);
if (!memmap)
return -ENOMEM;
usemap = __kmalloc_section_usemap();
if (!usemap) {
- __kfree_section_memmap(memmap, altmap);
+ free_section_memmap(memmap, altmap);
return -ENOMEM;
}
@@ -821,7 +821,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;
}
@@ -872,7 +872,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.13.7
next prev parent reply other threads:[~2019-03-28 13:44 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 13:43 [PATCH 0/4] mm,memory_hotplug: allocate memmap from hotadded memory Oscar Salvador
2019-03-28 13:43 ` [PATCH 1/4] mm, memory_hotplug: cleanup memory offline path Oscar Salvador
2019-04-03 8:43 ` Michal Hocko
2019-03-28 13:43 ` [PATCH 2/4] mm, memory_hotplug: provide a more generic restrictions for memory hotplug Oscar Salvador
2019-04-03 8:46 ` Michal Hocko
2019-04-03 8:48 ` David Hildenbrand
2019-04-04 10:04 ` Oscar Salvador
2019-04-04 10:06 ` David Hildenbrand
2019-04-04 10:31 ` Michal Hocko
2019-04-04 12:04 ` Oscar Salvador
2019-03-28 13:43 ` [PATCH 3/4] mm, memory_hotplug: allocate memmap from the added memory range for sparse-vmemmap Oscar Salvador
2019-03-28 13:43 ` Oscar Salvador [this message]
2019-03-28 15:09 ` [PATCH 0/4] mm,memory_hotplug: allocate memmap from hotadded memory David Hildenbrand
2019-03-28 15:31 ` David Hildenbrand
2019-03-29 8:45 ` Oscar Salvador
2019-03-29 8:56 ` David Hildenbrand
2019-03-29 9:01 ` David Hildenbrand
2019-03-29 9:20 ` Oscar Salvador
2019-03-29 13:42 ` Michal Hocko
2019-04-01 7:59 ` Oscar Salvador
2019-04-01 11:53 ` Michal Hocko
2019-04-02 8:28 ` Oscar Salvador
2019-04-02 8:39 ` David Hildenbrand
2019-04-02 12:48 ` Michal Hocko
2019-04-03 8:01 ` Oscar Salvador
2019-04-03 8:12 ` Michal Hocko
2019-04-03 8:17 ` David Hildenbrand
2019-04-03 8:37 ` Michal Hocko
2019-04-03 8:41 ` David Hildenbrand
2019-04-03 8:49 ` Michal Hocko
2019-04-03 8:53 ` David Hildenbrand
2019-04-03 8:50 ` Oscar Salvador
2019-04-03 8:54 ` David Hildenbrand
2019-04-03 9:40 ` Oscar Salvador
2019-04-03 10:46 ` Michal Hocko
2019-04-04 10:25 ` Vlastimil Babka
2019-04-03 8:34 ` Oscar Salvador
2019-04-03 8:36 ` David Hildenbrand
2019-03-29 8:30 ` Oscar Salvador
2019-03-29 8:51 ` David Hildenbrand
2019-03-29 22:23 ` John Hubbard
2019-04-01 7:52 ` Oscar Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190328134320.13232-5-osalvador@suse.de \
--to=osalvador@suse.de \
--cc=Jonathan.Cameron@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=dan.j.williams@intel.com \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox