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 <jmesmon@gmail.com>,
Cody P Schafer <cody@linux.vnet.ibm.com>
Subject: [PATCH 09/17] mm/page_alloc: use zone_end_pfn() & zone_spans_pfn()
Date: Tue, 15 Jan 2013 16:24:46 -0800 [thread overview]
Message-ID: <1358295894-24167-10-git-send-email-cody@linux.vnet.ibm.com> (raw)
In-Reply-To: <1358295894-24167-1-git-send-email-cody@linux.vnet.ibm.com>
From: Cody P Schafer <jmesmon@gmail.com>
Change several open coded zone_end_pfn()s and a zone_spans_pfn() in the
page allocator to use the provided helper functions.
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
---
mm/page_alloc.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c5d70ce..f8ed277 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1272,7 +1272,7 @@ void mark_free_pages(struct zone *zone)
spin_lock_irqsave(&zone->lock, flags);
- max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
+ max_zone_pfn = zone_end_pfn(zone);
for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
if (pfn_valid(pfn)) {
struct page *page = pfn_to_page(pfn);
@@ -3775,7 +3775,7 @@ static void setup_zone_migrate_reserve(struct zone *zone)
* the block.
*/
start_pfn = zone->zone_start_pfn;
- end_pfn = start_pfn + zone->spanned_pages;
+ end_pfn = zone_end_pfn(zone);
start_pfn = roundup(start_pfn, pageblock_nr_pages);
reserve = roundup(min_wmark_pages(zone), pageblock_nr_pages) >>
pageblock_order;
@@ -3889,7 +3889,7 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
* pfn out of zone.
*/
if ((z->zone_start_pfn <= pfn)
- && (pfn < z->zone_start_pfn + z->spanned_pages)
+ && (pfn < zone_end_pfn(z))
&& !(pfn & (pageblock_nr_pages - 1)))
set_pageblock_migratetype(page, MIGRATE_MOVABLE);
@@ -4617,7 +4617,7 @@ static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat)
* for the buddy allocator to function correctly.
*/
start = pgdat->node_start_pfn & ~(MAX_ORDER_NR_PAGES - 1);
- end = pgdat->node_start_pfn + pgdat->node_spanned_pages;
+ end = pgdat_end_pfn(pgdat);
end = ALIGN(end, MAX_ORDER_NR_PAGES);
size = (end - start) * sizeof(struct page);
map = alloc_remap(pgdat->node_id, size);
@@ -5735,8 +5735,7 @@ bool is_pageblock_removable_nolock(struct page *page)
zone = page_zone(page);
pfn = page_to_pfn(page);
- if (zone->zone_start_pfn > pfn ||
- zone->zone_start_pfn + zone->spanned_pages <= pfn)
+ if (!zone_spans_pfn(zone, pfn))
return false;
return !has_unmovable_pages(zone, page, 0, true);
--
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 ` [PATCH 05/17] mm/memory_hotplug: use ensure_zone_is_initialized() Cody P Schafer
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 ` Cody P Schafer [this message]
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-10-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=jmesmon@gmail.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).