mm-replace-config_flat_node_mem_map-with-config_flatmem.patch removed from -mm tree
The patch titled
Subject: mm: replace CONFIG_FLAT_NODE_MEM_MAP with CONFIG_FLATMEM
has been removed from the -mm tree. Its filename was
mm-replace-config_flat_node_mem_map-with-config_flatmem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: mm: replace CONFIG_FLAT_NODE_MEM_MAP with CONFIG_FLATMEM
After removal of the DISCONTIGMEM memory model the FLAT_NODE_MEM_MAP configuration option is equivalent to FLATMEM.
Drop CONFIG_FLAT_NODE_MEM_MAP and use CONFIG_FLATMEM instead.
---
include/linux/mmzone.h | 4 ++-- kernel/crash_core.c | 2 +- mm/Kconfig | 4 ---- mm/page_alloc.c | 6 +++--- mm/page_ext.c | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-)
include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-replace-config_flat_node_mem_map-with-config_flatmem +2 -2
@@ -788,7 +788,7 @@ typedef struct pglist_data {struct zonelist node_zonelists[MAX_ZONELISTS ];int nr_zones;/* number of populated zones in this node */ -#ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */ +#ifdef CONFIG_FLATMEM /* means !SPARSEMEM */ struct page *node_mem_map;#ifdef CONFIG_PAGE_EXTENSION struct page_ext *node_page_ext;
@@ -878,7 +878,7 @@ typedef struct pglist_data {#define node_present_pages (nid) (NODE_DATA(nid)->node_present_pages)#define node_spanned_pages (nid) (NODE_DATA(nid)->node_spanned_pages) -#ifdef CONFIG_FLAT_NODE_MEM_MAP +#ifdef CONFIG_FLATMEM #define pgdat_page_nr (pgdat, pagenr) ((pgdat)->node_mem_map + (pagenr))#else #define pgdat_page_nr (pgdat, pagenr) pfn_to_page((pgdat)->node_start_pfn + (pagenr))
kernel/crash_core.c renamed from kernel/crash_core.c~mm-replace-config_flat_node_mem_map-with-config_flatmem +1 -1
@@ -484,7 +484,7 @@ static int __init crash_save_vmcoreinfo_VMCOREINFO_OFFSET (page, compound_head);VMCOREINFO_OFFSET (pglist_data, node_zones);VMCOREINFO_OFFSET (pglist_data, nr_zones); -#ifdef CONFIG_FLAT_NODE_MEM_MAP +#ifdef CONFIG_FLATMEM VMCOREINFO_OFFSET (pglist_data, node_mem_map);#endif VMCOREINFO_OFFSET (pglist_data, node_start_pfn);
mm/Kconfig renamed from mm/Kconfig~mm-replace-config_flat_node_mem_map-with-config_flatmem +0 -4
@@ -55,10 +55,6 @@ config FLATMEM def_bool y depends on !SPARSEMEM || FLATMEM_MANUAL -config FLAT_NODE_MEM_MAP - def_bool y - depends on !SPARSEMEM - # # SPARSEMEM_EXTREME (which is the default) does some bootmem # allocations when sparse_init() is called. If this cannot
mm/page_alloc.c renamed from mm/page_alloc.c~mm-replace-config_flat_node_mem_map-with-config_flatmem +3 -3
@@ -6547,7 +6547,7 @@ static void __meminit zone_init_free_lis } } -#if !defined(CONFIG_FLAT_NODE_MEM_MAP ) +#if !defined(CONFIG_FLATMEM )/* * Only struct pages that correspond to ranges defined by memblock.memory * are zeroed and initialized by going through __init_single_page() during
@@ -7403,7 +7403,7 @@ static void __init free_area_init_core(s } } -#ifdef CONFIG_FLAT_NODE_MEM_MAP +#ifdef CONFIG_FLATMEM static void __ref alloc_node_mem_map (struct pglist_data *pgdat) {unsigned long __maybe_unused start =0 ;
@@ -7451,7 +7451,7 @@ static void __ref alloc_node_mem_map(str }#else static void __ref alloc_node_mem_map (struct pglist_data *pgdat) { } -#endif /* CONFIG_FLAT_NODE_MEM_MAP */ +#endif /* CONFIG_FLATMEM */ #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT static inline void pgdat_set_deferred_range (pg_data_t *pgdat)
mm/page_ext.c renamed from mm/page_ext.c~mm-replace-config_flat_node_mem_map-with-config_flatmem +1 -1
@@ -191,7 +191,7 @@ fail: panic("Out of memory"); } -#else /* CONFIG_FLAT_NODE_MEM_MAP */ +#else /* CONFIG_FLATMEM */ struct page_ext *lookup_page_ext (const struct page *page) {
_
Patches currently in -mm which might be from [email protected] are
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