All of lore.kernel.org
 help / color / mirror / Atom feed
From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, akpm@linux-foundation.org,
	gopakumarr@vmware.com, rppt@kernel.org, david@redhat.com,
	bhe@redhat.com
Subject: [PATCH v2 4/5] mm: simplify parameter of setup_usemap()
Date: Sun, 20 Dec 2020 16:27:53 +0800	[thread overview]
Message-ID: <20201220082754.6900-5-bhe@redhat.com> (raw)
In-Reply-To: <20201220082754.6900-1-bhe@redhat.com>

Parameter 'zone' has got needed information, let's remove other
unnecessary parameters.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 mm/page_alloc.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7a6626351ed7..7f0a917ab858 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6824,25 +6824,22 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l
 	return usemapsize / 8;
 }
 
-static void __ref setup_usemap(struct pglist_data *pgdat,
-				struct zone *zone,
-				unsigned long zone_start_pfn,
-				unsigned long zonesize)
+static void __ref setup_usemap(struct zone *zone)
 {
-	unsigned long usemapsize = usemap_size(zone_start_pfn, zonesize);
+	unsigned long usemapsize = usemap_size(zone->zone_start_pfn,
+					       zone->spanned_pages);
 	zone->pageblock_flags = NULL;
 	if (usemapsize) {
 		zone->pageblock_flags =
 			memblock_alloc_node(usemapsize, SMP_CACHE_BYTES,
-					    pgdat->node_id);
+					    zone_to_nid(zone));
 		if (!zone->pageblock_flags)
 			panic("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n",
-			      usemapsize, zone->name, pgdat->node_id);
+			      usemapsize, zone->name, zone_to_nid(zone));
 	}
 }
 #else
-static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone,
-				unsigned long zone_start_pfn, unsigned long zonesize) {}
+static inline void setup_usemap(struct zone *zone) {}
 #endif /* CONFIG_SPARSEMEM */
 
 #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -7037,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)
 			continue;
 
 		set_pageblock_order();
-		setup_usemap(pgdat, zone, zone_start_pfn, size);
+		setup_usemap(zone);
 		init_currently_empty_zone(zone, zone_start_pfn, size);
 		memmap_init_zone(zone);
 	}
-- 
2.17.2


  parent reply	other threads:[~2020-12-20  8:30 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-20  8:27 [PATCH v2 0/5] Fix the incorrect memmep defer init handling and do some cleanup Baoquan He
2020-12-20  8:27 ` [PATCH v2 1/5] mm: memmap defer init dosn't work as expected Baoquan He
2020-12-21  6:32   ` Mike Rapoport
2020-12-20  8:27 ` [PATCH v2 2/5] mm: rename memmap_init() and memmap_init_zone() Baoquan He
2020-12-21  6:33   ` Mike Rapoport
2020-12-20  8:27 ` [PATCH v2 3/5] mm: simplify parater of function memmap_init_zone() Baoquan He
2020-12-21  6:34   ` Mike Rapoport
2020-12-20  8:27 ` Baoquan He [this message]
2020-12-21  6:34   ` [PATCH v2 4/5] mm: simplify parameter of setup_usemap() Mike Rapoport
2020-12-20  8:27 ` [PATCH v2 5/5] mm: remove unneeded local variable in free_area_init_core Baoquan He
2020-12-21  6:35   ` Mike Rapoport
2020-12-23  1:46 ` [PATCH v2 0/5] Fix the incorrect memmep defer init handling and do some cleanup Andrew Morton
2020-12-23  2:05   ` Baoquan He
2020-12-23  8:12     ` Baoquan He

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=20201220082754.6900-5-bhe@redhat.com \
    --to=bhe@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=gopakumarr@vmware.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=rppt@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.