arc-remove-support-for-discontigmem.patch removed from -mm tree
The patch titled
Subject: arc: remove support for DISCONTIGMEM
has been removed from the -mm tree. Its filename was
arc-remove-support-for-discontigmem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: arc: remove support for DISCONTIGMEM
DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map in v5.11.
Remove the support for DISCONTIGMEM entirely.
---
arch/arc/Kconfig | 13 ---------- arch/arc/include/asm/mmzone.h | 40 -------------------------------- arch/arc/mm/init.c | 8 ------ 3 files changed, 61 deletions(-)
arch/arc/include/asm/mmzone.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) -*/ - -#ifndef _ASM_ARC_MMZONE_H -#define _ASM_ARC_MMZONE_H - -#ifdef CONFIG_DISCONTIGMEM - -extern struct pglist_data node_data[]; -#define NODE_DATA (nid) (&node_data[nid]) - -static inline int pfn_to_nid (unsigned long pfn) -{ -int is_end_low =1 ; - -if (IS_ENABLED (CONFIG_ARC_HAS_PAE40 )) - is_end_low = pfn <=virt_to_pfn (0xFFFFFFFFUL ); - -/* -* node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF -* node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF -* HIGHMEM with PAE40: 0x1_0000_0000 to ... -*/ -if (pfn >=ARCH_PFN_OFFSET && is_end_low) -return 0 ; - -return 1 ; -} - -static inline int pfn_valid (unsigned long pfn) -{ -int nid =pfn_to_nid (pfn); - -return (pfn <=node_end_pfn (nid)); -} -#endif /* CONFIG_DISCONTIGMEM */ - -#endif
arch/arc/Kconfig renamed from arch/arc/Kconfig~arc-remove-support-for-discontigmem +0 -13
@@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER config GENERIC_CSUM def_bool y -config ARCH_DISCONTIGMEM_ENABLE - def_bool n - depends on BROKEN - config ARCH_FLATMEM_ENABLE def_bool y
@@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M endchoice -config NODES_SHIFT - int "Maximum NUMA Nodes (as a power of 2)" - default "0" if !DISCONTIGMEM - default "1" if DISCONTIGMEM - depends on NEED_MULTIPLE_NODES - help - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory - zones. - config ARC_COMPACT_IRQ_LEVELS depends on ISA_ARCOMPACT bool "Setup Timer IRQ as high Priority"
arch/arc/mm/init.c renamed from arch/arc/mm/init.c~arc-remove-support-for-discontigmem +0 -8
@@ -32,11 +32,6 @@ unsigned long arch_pfn_offset;EXPORT_SYMBOL (arch_pfn_offset);#endif -#ifdef CONFIG_DISCONTIGMEM -struct pglist_data node_data[MAX_NUMNODES ]__read_mostly ; -EXPORT_SYMBOL (node_data); -#endif -long __init arc_get_mem_sz (void ) {return low_mem_sz;
@@ -147,9 +142,6 @@ void __init setup_arch_memory(void)* to the hole is freed and ARC specific version of pfn_valid() * handles the hole in the memory map. */ -#ifdef CONFIG_DISCONTIGMEM -node_set_online (1 ); -#endif min_high_pfn =PFN_DOWN (high_mem_start); max_high_pfn =PFN_DOWN (high_mem_start + high_mem_sz);
_
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