Subject: [merged] mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch.patch removed from -mm tree
To: qiuxishi@xxxxxxxxxx,benh@xxxxxxxxxxxxxxxxxxx,james.hogan@xxxxxxxxxx,lethal@xxxxxxxxxxxx,paulus@xxxxxxxxx,tony.luck@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 13 Nov 2013 12:37:55 -0800
The patch titled
Subject: mm: use pgdat_end_pfn() to simplify the code in arch
has been removed from the -mm tree. Its filename was
mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch.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 arch
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>
Cc: James Hogan <james.hogan@xxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/mm/init.c | 4 +---
arch/metag/mm/init.c | 2 +-
arch/powerpc/mm/numa.c | 3 +--
arch/sh/mm/init.c | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff -puN arch/ia64/mm/init.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch arch/ia64/mm/init.c
--- a/arch/ia64/mm/init.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch
+++ a/arch/ia64/mm/init.c
@@ -357,9 +357,7 @@ int vmemmap_find_next_valid_pfn(int node
end_address = (unsigned long) &vmem_map[pgdat->node_start_pfn + i];
end_address = PAGE_ALIGN(end_address);
-
- stop_address = (unsigned long) &vmem_map[
- pgdat->node_start_pfn + pgdat->node_spanned_pages];
+ stop_address = (unsigned long) &vmem_map[pgdat_end_pfn(pgdat)];
do {
pgd_t *pgd;
diff -puN arch/metag/mm/init.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch arch/metag/mm/init.c
--- a/arch/metag/mm/init.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch
+++ a/arch/metag/mm/init.c
@@ -148,7 +148,7 @@ static void __init bootmem_init_one_node
if (!p->node_spanned_pages)
return;
- end_pfn = p->node_start_pfn + p->node_spanned_pages;
+ end_pfn = pgdat_end_pfn(p);
#ifdef CONFIG_HIGHMEM
if (end_pfn > max_low_pfn)
end_pfn = max_low_pfn;
diff -puN arch/powerpc/mm/numa.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch arch/powerpc/mm/numa.c
--- a/arch/powerpc/mm/numa.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch
+++ a/arch/powerpc/mm/numa.c
@@ -938,8 +938,7 @@ static void __init mark_reserved_regions
unsigned long start_pfn = physbase >> PAGE_SHIFT;
unsigned long end_pfn = PFN_UP(physbase + size);
struct node_active_region node_ar;
- unsigned long node_end_pfn = node->node_start_pfn +
- node->node_spanned_pages;
+ unsigned long node_end_pfn = pgdat_end_pfn(node);
/*
* Check to make sure that this memblock.reserved area is
diff -puN arch/sh/mm/init.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch arch/sh/mm/init.c
--- a/arch/sh/mm/init.c~mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch
+++ a/arch/sh/mm/init.c
@@ -231,7 +231,7 @@ static void __init bootmem_init_one_node
if (!p->node_spanned_pages)
return;
- end_pfn = p->node_start_pfn + p->node_spanned_pages;
+ end_pfn = pgdat_end_pfn(p);
total_pages = bootmem_bootmap_pages(p->node_spanned_pages);
_
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
