arch-mm-remove-stale-mentions-of-disconigmem.patch removed from -mm tree
The patch titled
Subject: arch, mm: remove stale mentions of DISCONIGMEM
has been removed from the -mm tree. Its filename was
arch-mm-remove-stale-mentions-of-disconigmem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: arch, mm: remove stale mentions of DISCONIGMEM
There are several places that mention DISCONIGMEM in comments or have stale code guarded by CONFIG_DISCONTIGMEM.
Remove the dead code and update the comments.
---
arch/ia64/kernel/topology.c | 5 ++--- arch/ia64/mm/numa.c | 5 ++--- arch/mips/include/asm/mmzone.h | 6 ------ arch/mips/mm/init.c | 3 --- arch/nds32/include/asm/memory.h | 6 ------ arch/xtensa/include/asm/page.h | 4 ---- include/linux/gfp.h | 4 ++-- 7 files changed, 6 insertions(+), 27 deletions(-)
arch/ia64/kernel/topology.c renamed from arch/ia64/kernel/topology.c~arch-mm-remove-stale-mentions-of-disconigmem +2 -3
@@ -3,9 +3,8 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* This file contains NUMA specific variables and functions which can -* be split away from DISCONTIGMEM and are used on NUMA machines with -* contiguous memory. +* This file contains NUMA specific variables and functions which are used on +* NUMA machines with contiguous memory. * 2002/08/07 Erich Focht <[email protected]> * Populate cpu entries in sysfs for non-numa systems as well * Intel Corporation - Ashok Raj
arch/ia64/mm/numa.c renamed from arch/ia64/mm/numa.c~arch-mm-remove-stale-mentions-of-disconigmem +2 -3
@@ -3,9 +3,8 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* This file contains NUMA specific variables and functions which can -* be split away from DISCONTIGMEM and are used on NUMA machines with -* contiguous memory. +* This file contains NUMA specific variables and functions which are used on +* NUMA machines with contiguous memory. * * 2002/08/07 Erich Focht <[email protected]> */
arch/mips/include/asm/mmzone.h renamed from arch/mips/include/asm/mmzone.h~arch-mm-remove-stale-mentions-of-disconigmem +0 -6
@@ -20,10 +20,4 @@#define nid_to_addrbase (nid) 0#endif -#ifdef CONFIG_DISCONTIGMEM - -#define pfn_to_nid (pfn) pa_to_nid((pfn) << PAGE_SHIFT) - -#endif /* CONFIG_DISCONTIGMEM */ -#endif /* _ASM_MMZONE_H_ */
arch/mips/mm/init.c renamed from arch/mips/mm/init.c~arch-mm-remove-stale-mentions-of-disconigmem +0 -3
@@ -454,9 +454,6 @@ void __init mem_init(void)BUILD_BUG_ON (IS_ENABLED (CONFIG_32BIT ) && (_PFN_SHIFT >PAGE_SHIFT ));#ifdef CONFIG_HIGHMEM -#ifdef CONFIG_DISCONTIGMEM -#error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet" -#endif max_mapnr = highend_pfn ? highend_pfn : max_low_pfn;#else max_mapnr = max_low_pfn;
arch/nds32/include/asm/memory.h renamed from arch/nds32/include/asm/memory.h~arch-mm-remove-stale-mentions-of-disconigmem +0 -6
@@ -76,18 +76,12 @@* virt_to_page(k) convert a _valid_ virtual address to struct page * * virt_addr_valid(k) indicates whether a virtual address is valid */ -#ifndef CONFIG_DISCONTIGMEM -#define ARCH_PFN_OFFSET PHYS_PFN_OFFSET#define pfn_valid (pfn) ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))#define virt_to_page (kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))#define virt_addr_valid (kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) -#else /* CONFIG_DISCONTIGMEM */ -#error CONFIG_DISCONTIGMEM is not supported yet. -#endif /* !CONFIG_DISCONTIGMEM */ -#define page_to_phys (page) (page_to_pfn(page) << PAGE_SHIFT)#endif
arch/xtensa/include/asm/page.h renamed from arch/xtensa/include/asm/page.h~arch-mm-remove-stale-mentions-of-disconigmem +0 -4
@@ -192,10 +192,6 @@ static inline unsigned long ___pa(unsign#define pfn_valid (pfn) \ ((pfn) >= ARCH_PFN_OFFSET && ((pfn) - ARCH_PFN_OFFSET) < max_mapnr) -#ifdef CONFIG_DISCONTIGMEM -# error CONFIG_DISCONTIGMEM not supported -#endif -#define virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)#define page_to_virt (page) __va(page_to_pfn(page) << PAGE_SHIFT)#define virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
include/linux/gfp.h renamed from include/linux/gfp.h~arch-mm-remove-stale-mentions-of-disconigmem +2 -2
@@ -494,8 +494,8 @@ static inline int gfp_zonelist(gfp_t fla* There are two zonelists per node, one for all zones with memory and * one containing just zones from the node the zonelist belongs to. * -* For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets -* optimized to &contig_page_data at compile-time. +* For the case of non-NUMA systems the NODE_DATA() gets optimized to +* &contig_page_data at compile-time. */ static inline struct zonelist *node_zonelist (int nid,gfp_t flags) {
_
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