From: Cody P Schafer <cody@linux.vnet.ibm.com>
To: Linux MM <linux-mm@kvack.org>
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 05/17] mm/memory_hotplug: use ensure_zone_is_initialized()
Date: Tue, 15 Jan 2013 16:24:42 -0800 [thread overview]
Message-ID: <1358295894-24167-6-git-send-email-cody@linux.vnet.ibm.com> (raw)
In-Reply-To: <1358295894-24167-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 875bdfe..8e352fe 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-16 0:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 0:24 [PATCH 00/17] mm: zone & pgdat accessors plus some cleanup Cody P Schafer
2013-01-16 0:24 ` [PATCH 01/17] mm/compaction: rename var zone_end_pfn to avoid conflicts with new function Cody P Schafer
2013-01-16 1:08 ` Dave Hansen
2013-01-16 0:24 ` [PATCH 02/17] mmzone: add various zone_*() helper functions Cody P Schafer
2013-01-16 1:19 ` Dave Hansen
2013-01-16 1:20 ` Dave Hansen
2013-01-16 0:24 ` [PATCH 03/17] mm/page_alloc: add a VM_BUG in __free_one_page() if the zone is uninitialized Cody P Schafer
2013-01-16 0:24 ` [PATCH 04/17] mm: add helper ensure_zone_is_initialized() Cody P Schafer
2013-01-16 0:24 ` Cody P Schafer [this message]
2013-01-16 0:24 ` [PATCH 06/17] mmzone: add pgdat_{end_pfn,is_empty}() helpers & consolidate Cody P Schafer
2013-01-16 0:24 ` [PATCH 07/17] mm/page_alloc: use zone_spans_pfn() instead of open coding Cody P Schafer
2013-01-16 0:24 ` [PATCH 08/17] mm/page_alloc: use zone_spans_pfn() instead of open coded checks Cody P Schafer
2013-01-16 0:24 ` [PATCH 09/17] mm/page_alloc: use zone_end_pfn() & zone_spans_pfn() Cody P Schafer
2013-01-16 0:24 ` [PATCH 10/17] mm/vmstat: use zone_end_pfn() instead of opencoding Cody P Schafer
2013-01-16 0:24 ` [PATCH 11/17] mm/kmemleak: use node_{start,end}_pfn() Cody P Schafer
2013-01-16 0:24 ` [PATCH 12/17] mm/memory_hotplug: use pgdat_end_pfn() instead of open coding the same Cody P Schafer
2013-01-16 0:24 ` [PATCH 13/17] mm: add SECTION_IN_PAGE_FLAGS Cody P Schafer
2013-01-16 0:24 ` [PATCH 14/17] mm/memory_hotplug: factor out zone+pgdat growth Cody P Schafer
2013-01-16 1:27 ` Dave Hansen
2013-01-16 0:24 ` [PATCH 15/17] mm/page_alloc: add informative debugging message in page_outside_zone_boundaries() Cody P Schafer
2013-01-16 1:34 ` Dave Hansen
2013-01-16 0:24 ` [PATCH 16/17] mm/memory_hotplug: use zone_end_pfn() instead of open coding Cody P Schafer
2013-01-16 0:24 ` [PATCH 17/17] mm/compaction: use zone_end_pfn() Cody P Schafer
2013-01-16 1:39 ` Dave Hansen
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=1358295894-24167-6-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=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: 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;
as well as URLs for NNTP newsgroup(s).