The patch titled
Subject: x86-64: use vmemmap_populate_basepages() for !pse setups fix
has been removed from the -mm tree. Its filename was
x86-64-use-vmemmap_populate_basepages-for-pse-setups-fix.patch
This patch was dropped because it was folded into x86-64-use-vmemmap_populate_basepages-for-pse-setups.patch
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: x86-64: use vmemmap_populate_basepages() for !pse setups fix
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/init_64.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN arch/x86/mm/init_64.c~x86-64-use-vmemmap_populate_basepages-for-pse-setups-fix arch/x86/mm/init_64.c
--- a/arch/x86/mm/init_64.c~x86-64-use-vmemmap_populate_basepages-for-pse-setups-fix
+++ a/arch/x86/mm/init_64.c
@@ -1285,11 +1285,14 @@ static int __meminit vmemmap_populate_hu
unsigned long end, int node)
{
unsigned long addr;
+ unsigned long next;
pgd_t *pgd;
pud_t *pud;
pmd_t *pmd;
- for (addr = start; addr < end; addr += PMD_SIZE) {
+ for (addr = start; addr < end; addr = next) {
+ next = pmd_addr_end(addr, end);
+
pgd = vmemmap_pgd_populate(addr, node);
if (!pgd)
return -ENOMEM;
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
memcg-keep-prevs-css-alive-for-the-whole-mem_cgroup_iter.patch
memcg-rework-mem_cgroup_iter-to-use-cgroup-iterators.patch
memcg-relax-memcg-iter-caching.patch
memcg-simplify-mem_cgroup_iter.patch
memcg-further-simplify-mem_cgroup_iter.patch
cgroup-remove-css_get_next.patch
memcg-do-not-check-for-do_swap_account-in-mem_cgroup_readwritereset.patch
mm-try-harder-to-allocate-vmemmap-blocks.patch
sparse-vmemmap-specify-vmemmap-population-range-in-bytes.patch
x86-64-remove-dead-debugging-code-for-pse-setups.patch
x86-64-use-vmemmap_populate_basepages-for-pse-setups.patch
x86-64-fall-back-to-regular-page-vmemmap-on-allocation-failure.patch
mm-thp-add-split-tail-pages-to-shrink-page-list-in-page-reclaim.patch
memcg-avoid-accessing-memcg-after-releasing-reference.patch
thp-fix-huge-zero-page-logic-for-page-with-pfn-==-0.patch
mm-memcg-give-exiting-processes-access-to-memory-reserves.patch
swap-redirty-page-if-page-write-fails-on-swap-file.patch
mm-nobootmem-clean-up-of-free_low_memory_core_early.patch
mm-nobootmem-do-memset-after-memblock_reserve.patch
mem-hotunplug-fix-kfree-of-bootmem-memory.patch
mem-hotunplug-fix-kfree-of-bootmem-memory-fix.patch
memcg-take-reference-before-releasing-rcu_read_lock.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
