m68k-use-asm-generic-memory_modelh-for-both-mmu-and-mmu.patch removed from -mm tree
The quilt patch titled
Subject: m68k: use asm-generic/memory_model.h for both MMU and !MMU
has been removed from the -mm tree. Its filename was
m68k-use-asm-generic-memory_modelh-for-both-mmu-and-mmu.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (IBM)" <[email protected]>
Subject: m68k: use asm-generic/memory_model.h for both MMU and !MMU
Date: Sun, 29 Jan 2023 14:42:33 +0200
The MMU variant uses generic definitions of page_to_pfn() and pfn_to_page(), but !MMU defines them in include/asm/page_no.h for no good reason.
Include asm-generic/memory_model.h in the common include/asm/page.h and drop redundant definitions.
---
arch/m68k/include/asm/page.h | 6 +----- arch/m68k/include/asm/page_mm.h | 1 - arch/m68k/include/asm/page_no.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-)
arch/m68k/include/asm/page.h renamed from arch/m68k/include/asm/page.h~m68k-use-asm-generic-memory_modelh-for-both-mmu-and-mmu +1 -5
@@ -62,11 +62,7 @@ extern unsigned long _ramend;#include <asm/page_no.h> #endif -#ifndef CONFIG_MMU -#define __phys_to_pfn (paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) -#define __pfn_to_phys (pfn) PFN_PHYS(pfn) -#endif -#include <asm-generic/getorder.h> +#include <asm-generic/memory_model.h> #endif /* _M68K_PAGE_H */
arch/m68k/include/asm/page_mm.h renamed from arch/m68k/include/asm/page_mm.h~m68k-use-asm-generic-memory_modelh-for-both-mmu-and-mmu +0 -1
@@ -134,7 +134,6 @@ extern int m68k_virt_to_node_shift; })#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT) -#include <asm-generic/memory_model.h> #define virt_addr_valid (kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)#define pfn_valid (pfn) virt_addr_valid(pfn_to_virt(pfn))
arch/m68k/include/asm/page_no.h renamed from arch/m68k/include/asm/page_no.h~m68k-use-asm-generic-memory_modelh-for-both-mmu-and-mmu +0 -2
@@ -25,8 +25,6 @@ extern unsigned long memory_end;#define virt_to_page (addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT))#define page_to_virt (page) __va(((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)) -#define pfn_to_page (pfn) virt_to_page(pfn_to_virt(pfn)) -#define page_to_pfn (page) virt_to_pfn(page_to_virt(page))#define pfn_valid (pfn) ((pfn) < max_mapnr)#define virt_addr_valid (kaddr) (((unsigned long)(kaddr) >= PAGE_OFFSET) && \
_
Patches currently in -mm which might be from [email protected] are