The patch titled Subject: mm-check-if-section-present-during-memory-block-registering-fix has been added to the -mm tree. Its filename is mm-check-if-section-present-during-memory-block-registering-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-check-if-section-present-during-memory-block-registering-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-check-if-section-present-during-memory-block-registering-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/SubmitChecklist 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-check-if-section-present-during-memory-block-registering-fix simplification Cc: Greg KH <greg@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: Yinghai Lu <yinghai@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/base/node.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/base/node.c~mm-check-if-section-present-during-memory-block-registering-fix drivers/base/node.c --- a/drivers/base/node.c~mm-check-if-section-present-during-memory-block-registering-fix +++ a/drivers/base/node.c @@ -390,14 +390,13 @@ int register_mem_sect_under_node(struct sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr); sect_end_pfn += PAGES_PER_SECTION - 1; for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { - int page_nid, scn_nr; + int page_nid; /* * memory block could have several absent sections from start. * skip pfn range from absent section */ - scn_nr = pfn_to_section_nr(pfn); - if (!present_section_nr(scn_nr)) { + if (!present_section_nr(pfn_to_section_nr(pfn))) { pfn = round_down(pfn + PAGES_PER_SECTION, PAGES_PER_SECTION) - 1; continue; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-alpha-kernel-systblss-remove-debug-check.patch drivers-gpu-drm-i915-intel_spritec-fix-build.patch drivers-gpu-drm-i915-intel_tvc-fix-build.patch net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch memhp-add-hot-added-memory-ranges-to-memblock-before-allocate-node_data-for-a-node-checkpatch-fixes.patch mm-check-if-section-present-during-memory-block-registering-fix.patch kernel-kthreadc-kthread_create_on_node-clarify-documentation.patch scripts-spellingtxt-adding-misspelled-word-for-check-fix.patch fs-create-and-use-seq_show_option-for-escaping-fix.patch watchdog-introduce-watchdog_suspend-and-watchdog_resume-fix.patch watchdog-use-suspend-resume-interface-in-fixup_ht_bug-fix.patch mm.patch userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch genalloc-add-name-arg-to-gen_pool_get-and-devm_gen_pool_create-fix.patch genalloc-add-support-of-multiple-gen_pools-per-device-fix.patch mm-make-gup-handle-pfn-mapping-unless-foll_get-is-requested-fix.patch dax-revert-userfaultfd-change.patch thp-prepare-for-dax-huge-pages-fix.patch pagemap-add-mmap-exclusive-bit-for-marking-pages-mapped-only-here-fix.patch pagemap-update-documentation-fix.patch mm-show-proportional-swap-share-of-the-mapping-fix.patch mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch memcg-export-struct-mem_cgroup-fix.patch memcg-export-struct-mem_cgroup-fix-2.patch mm-hugetlb-add-cache-of-descriptors-to-resv_map-for-region_add-fix.patch mm-srcu-ify-shrinkers-fix-fix.patch x86-use-generic-early-mem-copy-fix.patch mm-mmap-simplify-the-failure-return-working-flow-fix.patch zswap-dynamic-pool-creation-fix.patch include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch proc-add-kpageidle-file-fix-6-fix.patch proc-add-kpageidle-file-fix-6-fix-2-fix.patch proc-export-idle-flag-via-kpageflags-fix.patch x86-add-pmd_-for-thp-fix.patch sparc-add-pmd_-for-thp-fix.patch mm-support-madvisemadv_free-fix-2.patch mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch fs-coda-fix-readlink-buffer-overflow-checkpatch-fixes.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix-fix.patch kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch align-crash_notes-allocation-to-make-it-be-inside-one-physical-page-fix.patch linux-next-rejects.patch fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix.patch mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.patch uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch do_shared_fault-check-that-mmap_sem-is-held.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