Subject: [merged] mm-use-pgdat_end_pfn-to-simplify-the-code-in-others.patch removed from -mm tree
To: qiuxishi@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 13 Nov 2013 12:37:57 -0800
The patch titled
Subject: mm: use pgdat_end_pfn() to simplify the code in others
has been removed from the -mm tree. Its filename was
mm-use-pgdat_end_pfn-to-simplify-the-code-in-others.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Subject: mm: use pgdat_end_pfn() to simplify the code in others
Use "pgdat_end_pfn()" instead of "pgdat->node_start_pfn +
pgdat->node_spanned_pages". Simplify the code, no functional change.
Signed-off-by: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/kcore.c | 3 +--
mm/bootmem.c | 2 +-
mm/memory_hotplug.c | 9 ++++-----
3 files changed, 6 insertions(+), 8 deletions(-)
diff -puN fs/proc/kcore.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-others fs/proc/kcore.c
--- a/fs/proc/kcore.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-others
+++ a/fs/proc/kcore.c
@@ -255,8 +255,7 @@ static int kcore_update_ram(void)
end_pfn = 0;
for_each_node_state(nid, N_MEMORY) {
unsigned long node_end;
- node_end = NODE_DATA(nid)->node_start_pfn +
- NODE_DATA(nid)->node_spanned_pages;
+ node_end = node_end_pfn(nid);
if (end_pfn < node_end)
end_pfn = node_end;
}
diff -puN mm/bootmem.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-others mm/bootmem.c
--- a/mm/bootmem.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-others
+++ a/mm/bootmem.c
@@ -784,7 +784,7 @@ void * __init __alloc_bootmem_node_high(
return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
/* update goal according ...MAX_DMA32_PFN */
- end_pfn = pgdat->node_start_pfn + pgdat->node_spanned_pages;
+ end_pfn = pgdat_end_pfn(pgdat);
if (end_pfn > MAX_DMA32_PFN + (128 >> (20 - PAGE_SHIFT)) &&
(goal >> PAGE_SHIFT) < MAX_DMA32_PFN) {
diff -puN mm/memory_hotplug.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-others mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-others
+++ a/mm/memory_hotplug.c
@@ -365,8 +365,7 @@ out_fail:
static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn,
unsigned long end_pfn)
{
- unsigned long old_pgdat_end_pfn =
- pgdat->node_start_pfn + pgdat->node_spanned_pages;
+ unsigned long old_pgdat_end_pfn = pgdat_end_pfn(pgdat);
if (!pgdat->node_spanned_pages || start_pfn < pgdat->node_start_pfn)
pgdat->node_start_pfn = start_pfn;
@@ -579,9 +578,9 @@ static void shrink_zone_span(struct zone
static void shrink_pgdat_span(struct pglist_data *pgdat,
unsigned long start_pfn, unsigned long end_pfn)
{
- unsigned long pgdat_start_pfn = pgdat->node_start_pfn;
- unsigned long pgdat_end_pfn =
- pgdat->node_start_pfn + pgdat->node_spanned_pages;
+ unsigned long pgdat_start_pfn = pgdat->node_start_pfn;
+ unsigned long p = pgdat_end_pfn(pgdat); /* pgdat_end_pfn namespace clash */
+ unsigned long pgdat_end_pfn = p;
unsigned long pfn;
struct mem_section *ms;
int nid = pgdat->node_id;
_
Patches currently in -mm which might be from qiuxishi@xxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
