powerpc-mm-remove-_page_psize.patch removed from -mm tree
The quilt patch titled
Subject: powerpc/mm: remove _PAGE_PSIZE
has been removed from the -mm tree. Its filename was
powerpc-mm-remove-_page_psize.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: Christophe Leroy <[email protected]>
Subject: powerpc/mm: remove _PAGE_PSIZE
Date: Tue, 2 Jul 2024 15:51:21 +0200
_PAGE_PSIZE macro is never used outside the place it is defined and is used only on 8xx and e500.
Remove indirection, remove it and use its content directly.
Link https://lkml.kernel.org/r/c41da3b0ceda7311a50f0391cc4d54302ae15b74.1719928057.git.christophe.leroy@csgroup.eu open here
Signed-off-by Christophe Leroy <[email protected]>
Reviewed-by Oscar Salvador <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Peter Xu <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/powerpc/include/asm/nohash/32/pte-44x.h | 3 --- arch/powerpc/include/asm/nohash/32/pte-85xx.h | 3 --- arch/powerpc/include/asm/nohash/32/pte-8xx.h | 5 ++--- arch/powerpc/include/asm/nohash/pte-e500.h | 4 +--- 4 files changed, 3 insertions(+), 12 deletions(-)
arch/powerpc/include/asm/nohash/32/pte-44x.h renamed from arch/powerpc/include/asm/nohash/32/pte-44x.h~powerpc-mm-remove-_page_psize +0 -3
@@ -75,9 +75,6 @@#define _PAGE_NO_CACHE 0x00000400/* H: I bit */ #define _PAGE_WRITETHRU 0x00000800/* H: W bit */ -/* No page size encoding in the linux PTE */ -#define _PAGE_PSIZE 0 -/* TODO: Add large page lowmem mapping support */ #define _PMD_PRESENT 0#define _PMD_PRESENT_MASK (PAGE_MASK)
arch/powerpc/include/asm/nohash/32/pte-85xx.h renamed from arch/powerpc/include/asm/nohash/32/pte-85xx.h~powerpc-mm-remove-_page_psize +0 -3
@@ -31,9 +31,6 @@#define _PAGE_WRITETHRU 0x00400/* H: W bit */ #define _PAGE_SPECIAL 0x00800/* S: Special page */ -/* No page size encoding in the linux PTE */ -#define _PAGE_PSIZE 0 -#define _PMD_PRESENT 0#define _PMD_PRESENT_MASK (PAGE_MASK)#define _PMD_BAD (~PAGE_MASK)
arch/powerpc/include/asm/nohash/32/pte-8xx.h renamed from arch/powerpc/include/asm/nohash/32/pte-8xx.h~powerpc-mm-remove-_page_psize +2 -3
@@ -74,12 +74,11 @@#define _PTE_NONE_MASK 0#ifdef CONFIG_PPC_16K_PAGES -#define _PAGE_PSIZE _PAGE_SPS +#define _PAGE_BASE_NC (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_SPS)#else -#define _PAGE_PSIZE 0 +#define _PAGE_BASE_NC (_PAGE_PRESENT | _PAGE_ACCESSED)#endif -#define _PAGE_BASE_NC (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_PSIZE)#define _PAGE_BASE (_PAGE_BASE_NC)#include <asm/pgtable-masks.h>
arch/powerpc/include/asm/nohash/pte-e500.h renamed from arch/powerpc/include/asm/nohash/pte-e500.h~powerpc-mm-remove-_page_psize +1 -3
@@ -65,8 +65,6 @@#define _PAGE_SPECIAL _PAGE_SW0 -/* Base page size */ -#define _PAGE_PSIZE _PAGE_PSIZE_4K#define PTE_RPN_SHIFT (24)#define PTE_WIMGE_SHIFT (19)
@@ -89,7 +87,7 @@* pages. We always set _PAGE_COHERENT when SMP is enabled or * the processor might need it for DMA coherency. */ -#define _PAGE_BASE_NC (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_PSIZE) +#define _PAGE_BASE_NC (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_PSIZE_4K)#if defined(CONFIG_SMP )#define _PAGE_BASE (_PAGE_BASE_NC | _PAGE_COHERENT)#else
_
Patches currently in -mm which might be from [email protected] are