The patch titled Subject: mm-replace-config_need_multiple_nodes-with-config_numa-fix has been added to the -mm tree. Its filename is mm-replace-config_need_multiple_nodes-with-config_numa-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-replace-config_need_multiple_nodes-with-config_numa-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-replace-config_need_multiple_nodes-with-config_numa-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: Mike Rapoport <rppt@xxxxxxxxxxxxx> Subject: mm-replace-config_need_multiple_nodes-with-config_numa-fix Fix arm boot crash Take into account the change in pgdat_to_phys(). In the long run I think we should get rid of contig_page_data and allocate NODE_DATA(0) for !NUMA case as well. Andrew, can you please add this as a fixup to "mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA"? Link: https://lkml.kernel.org/r/YMj9vHhHOiCVN4BF@xxxxxxxxxxxxx Reported-by: Naresh Kamboju <naresh.kamboju@xxxxxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Christophe Leroy <christophe.leroy@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/sparse.c~mm-replace-config_need_multiple_nodes-with-config_numa-fix +++ a/mm/sparse.c @@ -346,7 +346,7 @@ size_t mem_section_usage_size(void) static inline phys_addr_t pgdat_to_phys(struct pglist_data *pgdat) { -#ifndef CONFIG_NEED_MULTIPLE_NODES +#ifndef CONFIG_NUMA return __pa_symbol(pgdat); #else return __pa(pgdat); _ Patches currently in -mm which might be from rppt@xxxxxxxxxxxxx are mm-mmzoneh-simplify-is_highmem_idx.patch alpha-remove-discontigmem-and-numa.patch arc-update-comment-about-highmem-implementation.patch arc-remove-support-for-discontigmem.patch m68k-remove-support-for-discontigmem.patch mm-remove-config_discontigmem.patch arch-mm-remove-stale-mentions-of-disconigmem.patch docs-remove-description-of-discontigmem.patch mm-replace-config_need_multiple_nodes-with-config_numa.patch mm-replace-config_need_multiple_nodes-with-config_numa-fix.patch mm-replace-config_flat_node_mem_map-with-config_flatmem.patch docs-procrst-meminfo-briefly-describe-gaps-in-memory-accounting.patch include-linux-mmzoneh-add-documentation-for-pfn_valid.patch memblock-update-initialization-of-reserved-pages.patch arm64-decouple-check-whether-pfn-is-in-linear-map-from-pfn_valid.patch arm64-drop-pfn_valid_within-and-simplify-pfn_valid.patch mmap-make-mlock_future_check-global.patch riscv-kconfig-make-direct-map-manipulation-options-depend-on-mmu.patch set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-where-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch