Subject: [PATCH v5 02/10] mm/memmap_init: Update variable name in memmap_init_zone

From: David Hildenbrand <[email-masked]>
Date: Tue, 1 Oct 2019 16:40:03 +0200

From: "Aneesh Kumar K.V" <[email-masked]>

The third argument is actually number of pages. Changes the variable name
from size to nr_pages to indicate this better.

No functional change in this patch.

Cc: Andrew Morton <[email-masked]>
Cc: Michal Hocko <[email-masked]>
Cc: Vlastimil Babka <[email-masked]>
Cc: Oscar Salvador <[email-masked]>
Cc: Mel Gorman <[email-masked]>
Cc: Mike Rapoport <[email-masked]>
Cc: Dan Williams <[email-masked]>
Cc: Alexander Duyck <[email-masked]>
Cc: Pavel Tatashin <[email-masked]>
Cc: Alexander Potapenko <[email-masked]>
Reviewed-by: Pankaj Gupta <[email-masked]>
Reviewed-by: David Hildenbrand <[email-masked]>
Signed-off-by: Aneesh Kumar K.V <[email-masked]>
Signed-off-by: David Hildenbrand <[email-masked]>
---
 mm/page_alloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 15c2050c629b..b0b2d5464000 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5936,10 +5936,10 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
 #ifdef CONFIG_ZONE_DEVICE
 void __ref memmap_init_zone_device(struct zone *zone,
 				   unsigned long start_pfn,
-				   unsigned long size,
+				   unsigned long nr_pages,
 				   struct dev_pagemap *pgmap)
 {
-	unsigned long pfn, end_pfn = start_pfn + size;
+	unsigned long pfn, end_pfn = start_pfn + nr_pages;
 	struct pglist_data *pgdat = zone->zone_pgdat;
 	struct vmem_altmap *altmap = pgmap_altmap(pgmap);
 	unsigned long zone_idx = zone_idx(zone);
@@ -5956,7 +5956,7 @@ void __ref memmap_init_zone_device(struct zone *zone,
 	 */
 	if (altmap) {
 		start_pfn = altmap->base_pfn + vmem_altmap_offset(altmap);
-		size = end_pfn - start_pfn;
+		nr_pages = end_pfn - start_pfn;
 	}
 
 	for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -6003,7 +6003,7 @@ void __ref memmap_init_zone_device(struct zone *zone,
 	}
 
 	pr_info("%s initialised %lu pages in %ums\n", __func__,
-		size, jiffies_to_msecs(jiffies - start));
+		nr_pages, jiffies_to_msecs(jiffies - start));
 }
 
 #endif
-- 
2.21.0

_______________________________________________
linux-arm-kernel mailing list
[email-masked]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel