m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem.patch removed from -mm tree
The patch titled
Subject: m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM
has been removed from the -mm tree. Its filename was
m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM
The pg_data_map and pg_data_table arrays as well as page_to_pfn() and pfn_to_page() are required only for DISCONTIGMEM. Other memory models can use the generic definitions in asm-generic/memory_model.h.
---
arch/m68k/Kconfig.cpu | 1 - arch/m68k/include/asm/page.h | 2 ++ arch/m68k/include/asm/page_mm.h | 5 +++++ arch/m68k/include/asm/virtconvert.h | 5 ----- arch/m68k/mm/init.c | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-)
arch/m68k/include/asm/page.h renamed from arch/m68k/include/asm/page.h~m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem +2 -0
@@ -62,8 +62,10 @@ extern unsigned long _ramend;#include <asm/page_no.h> #endif +#ifdef CONFIG_DISCONTIGMEM #define __phys_to_pfn (paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))#define __pfn_to_phys (pfn) PFN_PHYS(pfn) +#endif #include <asm-generic/getorder.h>
arch/m68k/include/asm/page_mm.h renamed from arch/m68k/include/asm/page_mm.h~m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem +5 -0
@@ -153,6 +153,7 @@ static inline __attribute_const__ int __pfn_to_virt (page_to_pfn (page)); \ }) +#ifdef CONFIG_DISCONTIGMEM #define pfn_to_page (pfn) ({ \ unsigned long __pfn = (pfn); \ struct pglist_data *pgdat; \
@@ -165,6 +166,10 @@ static inline __attribute_const__ int __ pgdat = &pg_data_map[page_to_nid (__p)]; \ ((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \ }) +#else +#define ARCH_PFN_OFFSET (m68k_memory[0].addr) +#include <asm-generic/memory_model.h> +#endif #define virt_addr_valid (kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)#define pfn_valid (pfn) virt_addr_valid(pfn_to_virt(pfn))
arch/m68k/include/asm/virtconvert.h renamed from arch/m68k/include/asm/virtconvert.h~m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem +0 -5
@@ -29,12 +29,7 @@ static inline void *phys_to_virt(unsigne }/* Permanent address of a page. */ -#if defined(CONFIG_MMU ) && !defined(CONFIG_DISCONTIGMEM ) -#define page_to_phys (page) \ - __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) -#else #define page_to_phys (page) (page_to_pfn(page) << PAGE_SHIFT) -#endif /* * IO bus memory addresses are 1:1 with the physical address,
arch/m68k/Kconfig.cpu renamed from arch/m68k/Kconfig.cpu~m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem +0 -1
@@ -374,7 +374,6 @@ config SINGLE_MEMORY_CHUNK bool "Use one physical chunk of memory only" if ADVANCED && !SUN3 depends on MMU default y if SUN3 || MMU_COLDFIRE - select NEED_MULTIPLE_NODES help Ignore all but the first contiguous chunk of physical memory for VM purposes. This will save a few bytes kernel size and may speed up
arch/m68k/mm/init.c renamed from arch/m68k/mm/init.c~m68k-mm-enable-use-of-generic-memory_modelh-for-discontigmem +3 -3
@@ -42,12 +42,12 @@ EXPORT_SYMBOL(empty_zero_page);#ifdef CONFIG_MMU -pg_data_t pg_data_map[MAX_NUMNODES ]; -EXPORT_SYMBOL (pg_data_map); -int m68k_virt_to_node_shift;#ifdef CONFIG_DISCONTIGMEM +pg_data_t pg_data_map[MAX_NUMNODES ]; +EXPORT_SYMBOL (pg_data_map); +pg_data_t *pg_data_table[65 ];EXPORT_SYMBOL (pg_data_table);#endif
_
Patches currently in -mm which might be from [email protected] are
mm-memblock-enforce-overlap-of-memorymemblock-and-memoryreserved.patch mm-fix-initialization-of-struct-page-for-holes-in-memory-layout.patch mm-add-definition-of-pmd_page_order.patch mmap-make-mlock_future_check-global.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages.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 secretmem-use-pmd-size-pages-to-amortize-direct-map-fragmentation.patch secretmem-add-memcg-accounting.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch