From: Cody P Schafer <cody@linux.vnet.ibm.com> To: Linux MM <linux-mm@kvack.org>, David Hansen <dave@linux.vnet.ibm.com> Cc: LKML <linux-kernel@vger.kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Cody P Schafer <cody@linux.vnet.ibm.com> Subject: [PATCH 8/9] mm/memory_hotplug: use ensure_zone_is_initialized() Date: Thu, 17 Jan 2013 14:53:00 -0800 [thread overview] Message-ID: <1358463181-17956-9-git-send-email-cody@linux.vnet.ibm.com> (raw) In-Reply-To: <1358463181-17956-1-git-send-email-cody@linux.vnet.ibm.com> Remove open coding of ensure_zone_is_initialzied(). Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> --- mm/memory_hotplug.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index bede456..016944f 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -271,12 +271,9 @@ static int __meminit move_pfn_range_left(struct zone *z1, struct zone *z2, unsigned long flags; unsigned long z1_start_pfn; - if (!z1->wait_table) { - ret = init_currently_empty_zone(z1, start_pfn, - end_pfn - start_pfn, MEMMAP_HOTPLUG); - if (ret) - return ret; - } + ret = ensure_zone_is_initialized(z1, start_pfn, end_pfn - start_pfn); + if (ret) + return ret; pgdat_resize_lock(z1->zone_pgdat, &flags); @@ -316,12 +313,9 @@ static int __meminit move_pfn_range_right(struct zone *z1, struct zone *z2, unsigned long flags; unsigned long z2_end_pfn; - if (!z2->wait_table) { - ret = init_currently_empty_zone(z2, start_pfn, - end_pfn - start_pfn, MEMMAP_HOTPLUG); - if (ret) - return ret; - } + ret = ensure_zone_is_initialized(z2, start_pfn, end_pfn - start_pfn); + if (ret) + return ret; pgdat_resize_lock(z1->zone_pgdat, &flags); @@ -374,16 +368,13 @@ static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn) int nid = pgdat->node_id; int zone_type; unsigned long flags; + int ret; zone_type = zone - pgdat->node_zones; - if (!zone->wait_table) { - int ret; + ret = ensure_zone_is_initialized(zone, phys_start_pfn, nr_pages); + if (ret) + return ret; - ret = init_currently_empty_zone(zone, phys_start_pfn, - nr_pages, MEMMAP_HOTPLUG); - if (ret) - return ret; - } pgdat_resize_lock(zone->zone_pgdat, &flags); grow_zone_span(zone, phys_start_pfn, phys_start_pfn + nr_pages); grow_pgdat_span(zone->zone_pgdat, phys_start_pfn, -- 1.8.0.3
WARNING: multiple messages have this Message-ID (diff)
From: Cody P Schafer <cody@linux.vnet.ibm.com> To: Linux MM <linux-mm@kvack.org>, David Hansen <dave@linux.vnet.ibm.com> Cc: LKML <linux-kernel@vger.kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Cody P Schafer <cody@linux.vnet.ibm.com> Subject: [PATCH 8/9] mm/memory_hotplug: use ensure_zone_is_initialized() Date: Thu, 17 Jan 2013 14:53:00 -0800 [thread overview] Message-ID: <1358463181-17956-9-git-send-email-cody@linux.vnet.ibm.com> (raw) In-Reply-To: <1358463181-17956-1-git-send-email-cody@linux.vnet.ibm.com> Remove open coding of ensure_zone_is_initialzied(). Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> --- mm/memory_hotplug.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index bede456..016944f 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -271,12 +271,9 @@ static int __meminit move_pfn_range_left(struct zone *z1, struct zone *z2, unsigned long flags; unsigned long z1_start_pfn; - if (!z1->wait_table) { - ret = init_currently_empty_zone(z1, start_pfn, - end_pfn - start_pfn, MEMMAP_HOTPLUG); - if (ret) - return ret; - } + ret = ensure_zone_is_initialized(z1, start_pfn, end_pfn - start_pfn); + if (ret) + return ret; pgdat_resize_lock(z1->zone_pgdat, &flags); @@ -316,12 +313,9 @@ static int __meminit move_pfn_range_right(struct zone *z1, struct zone *z2, unsigned long flags; unsigned long z2_end_pfn; - if (!z2->wait_table) { - ret = init_currently_empty_zone(z2, start_pfn, - end_pfn - start_pfn, MEMMAP_HOTPLUG); - if (ret) - return ret; - } + ret = ensure_zone_is_initialized(z2, start_pfn, end_pfn - start_pfn); + if (ret) + return ret; pgdat_resize_lock(z1->zone_pgdat, &flags); @@ -374,16 +368,13 @@ static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn) int nid = pgdat->node_id; int zone_type; unsigned long flags; + int ret; zone_type = zone - pgdat->node_zones; - if (!zone->wait_table) { - int ret; + ret = ensure_zone_is_initialized(zone, phys_start_pfn, nr_pages); + if (ret) + return ret; - ret = init_currently_empty_zone(zone, phys_start_pfn, - nr_pages, MEMMAP_HOTPLUG); - if (ret) - return ret; - } pgdat_resize_lock(zone->zone_pgdat, &flags); grow_zone_span(zone, phys_start_pfn, phys_start_pfn + nr_pages); grow_pgdat_span(zone->zone_pgdat, phys_start_pfn, -- 1.8.0.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-01-17 22:55 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-01-17 22:52 [PATCH v2 0/9] mm: zone & pgdat accessors plus some cleanup Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-01-17 22:52 ` [PATCH 1/9] mm: add SECTION_IN_PAGE_FLAGS Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-02-02 0:20 ` Andrew Morton 2013-02-02 0:20 ` Andrew Morton 2013-02-05 22:23 ` Cody P Schafer 2013-02-05 22:23 ` Cody P Schafer 2013-01-17 22:52 ` [PATCH 2/9] mm: add & use zone_end_pfn() and zone_spans_pfn() Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-01-17 22:52 ` [PATCH 3/9] mm: add zone_is_empty() and zone_is_initialized() Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-01-17 22:52 ` [PATCH 4/9] mm/page_alloc: add a VM_BUG in __free_one_page() if the zone is uninitialized Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-01-17 22:52 ` [PATCH 5/9] mmzone: add pgdat_{end_pfn,is_empty}() helpers & consolidate Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-02-02 0:23 ` Andrew Morton 2013-02-02 0:23 ` Andrew Morton 2013-01-17 22:52 ` [PATCH 6/9] mm/page_alloc: add informative debugging message in page_outside_zone_boundaries() Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-02-02 0:28 ` Andrew Morton 2013-02-02 0:28 ` Andrew Morton 2013-02-02 0:29 ` Andrew Morton 2013-02-02 0:29 ` Andrew Morton 2013-02-05 22:20 ` Cody P Schafer 2013-02-05 22:20 ` Cody P Schafer 2013-01-17 22:52 ` [PATCH 7/9] mm: add helper ensure_zone_is_initialized() Cody P Schafer 2013-01-17 22:52 ` Cody P Schafer 2013-01-17 22:53 ` Cody P Schafer [this message] 2013-01-17 22:53 ` [PATCH 8/9] mm/memory_hotplug: use ensure_zone_is_initialized() Cody P Schafer 2013-01-17 22:53 ` [PATCH 9/9] mm/memory_hotplug: use pgdat_end_pfn() instead of open coding the same Cody P Schafer 2013-01-17 22:53 ` Cody P Schafer 2013-02-02 0:39 ` [PATCH v2 0/9] mm: zone & pgdat accessors plus some cleanup Andrew Morton 2013-02-02 0:39 ` Andrew Morton 2013-02-05 22:59 ` Cody P Schafer 2013-02-05 22:59 ` Cody P Schafer
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=1358463181-17956-9-git-send-email-cody@linux.vnet.ibm.com \ --to=cody@linux.vnet.ibm.com \ --cc=akpm@linux-foundation.org \ --cc=catalin.marinas@arm.com \ --cc=dave@linux.vnet.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.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: linkBe 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.