Skip to contentSkip to conversation

m68k-nommu-add-missing-definition-of-arch_pfn_offset.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Feb 17, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: m68k/nommu: add missing definition of ARCH_PFN_OFFSET
has been removed from the -mm tree. Its filename was
m68k-nommu-add-missing-definition-of-arch_pfn_offset.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/nommu: add missing definition of ARCH_PFN_OFFSET
Date: Tue, 14 Feb 2023 16:07:28 +0200

Patch series "fixups for generic implementation of pfn_valid()".

Guenter reported boot failures on m68k-nommu and sh caused by the switch to the generic implementation of pfn_valid():

https://lore.kernel.org/all/[email protected]
https://lore.kernel.org/all/[email protected]

These are small fixups that address the issues.

This patch (of 2):

On m68k/nommu RAM does not necessarily start at 0x0 and when it does not pfn_valid() uses a wrong offset into the memory map which causes silent boot failures.

Define ARCH_PFN_OFFSET to make pfn_valid() use the correct offset.

Fixes d82f07f06cf8 ("m68k: use asm-generic/memory_model.h for both MMU and !MMU")
Cc Arnd Bergmann <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Rich Felker <[email protected]>
Cc Yoshinori Sato <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>

---

arch/m68k/include/asm/page_no.h renamed from arch/m68k/include/asm/page_no.h~m68k-nommu-add-missing-definition-of-arch_pfn_offset +2 -0
@@ -28,6 +28,8 @@ extern unsigned long memory_end;
 #define	virt_addr_valid(kaddr)	(((unsigned long)(kaddr) >= PAGE_OFFSET) && \
 				((unsigned long)(kaddr) < memory_end))
 
+#define ARCH_PFN_OFFSET PHYS_PFN(PAGE_OFFSET_RAW)
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _M68K_PAGE_NO_H */

_

Patches currently in -mm which might be from [email protected] are