The patch titled Subject: mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix has been added to the -mm tree. Its filename is mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix add WARN_ON_ONCE() Cc: Arun KS <arunks@xxxxxxxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxx> Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Nadav Amit <namit@xxxxxxxxxx> Cc: Wei Yang <richardw.yang@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memory_hotplug.c~mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix +++ a/mm/memory_hotplug.c @@ -647,7 +647,7 @@ static int online_pages_range(unsigned l for (pfn = start_pfn; pfn < end_pfn; pfn += 1ul << order) { order = min(MAX_ORDER - 1, get_order(PFN_PHYS(end_pfn - pfn))); /* __free_pages_core() wants pfns to be aligned to the order */ - if (unlikely(!IS_ALIGNED(pfn, 1ul << order))) + if (WARN_ON_ONCE(!IS_ALIGNED(pfn, 1ul << order))) order = 0; (*online_page_callback)(pfn_to_page(pfn), order); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch mm.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes-fix.patch mm-introduce-page_shift-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch mm-memory_hotplug-remove-move_pfn_range-fix.patch mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch psi-annotate-refault-stalls-from-io-submission-fix.patch psi-annotate-refault-stalls-from-io-submission-fix-2.patch mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch dev-kmem-debug-preadv-progress-fix.patch dev-kmem-debug-preadv-progress-fix-fix.patch diff-sucks.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch