Skip to contentSkip to conversation

powerpc-8xx-simplify-struct-mmu_psize_def.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 12, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: powerpc/8xx: simplify struct mmu_psize_def
has been removed from the -mm tree. Its filename was
powerpc-8xx-simplify-struct-mmu_psize_def.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/8xx: simplify struct mmu_psize_def
Date: Tue, 2 Jul 2024 15:51:26 +0200

On 8xx, only the shift field is used in struct mmu_psize_def

Remove other fields and related macros.

---

 arch/powerpc/include/asm/nohash/32/mmu-8xx.h |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/nohash/32/mmu-8xx.h renamed from arch/powerpc/include/asm/nohash/32/mmu-8xx.h~powerpc-8xx-simplify-struct-mmu_psize_def +2 -7
@@ -189,19 +189,14 @@ typedef struct {
 
 #define PHYS_IMMR_BASE (mfspr(SPRN_IMMR) & 0xfff80000)
 
-/* Page size definitions, common between 32 and 64-bit
+/*
+ * Page size definitions for 8xx
  *
  *    shift : is the "PAGE_SHIFT" value for that page size
- *    penc  : is the pte encoding mask
  *
  */
 struct mmu_psize_def {
 	unsigned int	shift;	/* number of bits */
-	unsigned int	enc;	/* PTE encoding */
-	unsigned int    ind;    /* Corresponding indirect page size shift */
-	unsigned int	flags;
-#define MMU_PAGE_SIZE_DIRECT	0x1	/* Supported as a direct size */
-#define MMU_PAGE_SIZE_INDIRECT	0x2	/* Supported as an indirect size */
 };
 
 extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];

_

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