The patch titled
Subject: mm: remove unused arg from memblock_next_valid_pfn()
has been removed from the -mm tree. Its filename was
mm-remove-unused-arg-from-memblock_next_valid_pfn.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm: remove unused arg from memblock_next_valid_pfn()
864b75f9d6b01 ("mm/page_alloc: fix memmap_init_zone pageblock alignment")
made the second arg to memblock_next_valid_pfn() obsolete, but it remained
in place due to a merge mess. Fix.
Fixes: 864b75f9d6b01 ("mm/page_alloc: fix memmap_init_zone pageblock alignment")
Cc: Daniel Vacek <neelx@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memblock.h | 2 +-
mm/memblock.c | 3 +--
mm/page_alloc.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff -puN include/linux/memblock.h~mm-remove-unused-arg-from-memblock_next_valid_pfn include/linux/memblock.h
--- a/include/linux/memblock.h~mm-remove-unused-arg-from-memblock_next_valid_pfn
+++ a/include/linux/memblock.h
@@ -187,7 +187,7 @@ int memblock_search_pfn_nid(unsigned lon
unsigned long *end_pfn);
void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
unsigned long *out_end_pfn, int *out_nid);
-unsigned long memblock_next_valid_pfn(unsigned long pfn, unsigned long max_pfn);
+unsigned long memblock_next_valid_pfn(unsigned long pfn);
/**
* for_each_mem_pfn_range - early memory pfn range iterator
diff -puN mm/memblock.c~mm-remove-unused-arg-from-memblock_next_valid_pfn mm/memblock.c
--- a/mm/memblock.c~mm-remove-unused-arg-from-memblock_next_valid_pfn
+++ a/mm/memblock.c
@@ -1101,8 +1101,7 @@ void __init_memblock __next_mem_pfn_rang
*out_nid = r->nid;
}
-unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn,
- unsigned long max_pfn)
+unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn)
{
struct memblock_type *type = &memblock.memory;
unsigned int right = type->cnt;
diff -puN mm/page_alloc.c~mm-remove-unused-arg-from-memblock_next_valid_pfn mm/page_alloc.c
--- a/mm/page_alloc.c~mm-remove-unused-arg-from-memblock_next_valid_pfn
+++ a/mm/page_alloc.c
@@ -5363,7 +5363,7 @@ void __meminit memmap_init_zone(unsigned
* end_pfn), such that we hit a valid pfn (or end_pfn)
* on our next iteration of the loop.
*/
- pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;
+ pfn = memblock_next_valid_pfn(pfn) - 1;
#endif
continue;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-mempolicy-avoid-use-uninitialized-preferred_node-fix.patch
hugetlbfs-check-for-pgoff-value-overflow-v3-fix.patch
hugetlbfs-check-for-pgoff-value-overflow-v3-fix-fix.patch
mm-vmalloc-add-interfaces-to-free-unmapped-page-table-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
mm-initialize-pages-on-demand-during-boot-v6-checkpatch-fixes.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.patch
mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-checkpatch-fixes.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
drivers-infiniband-ulp-srpt-ib_srptc-fix-build-with-gcc-444.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
