All of lore.kernel.org
 help / color / mirror / Atom feed
* [merged mm-stable] powerpc-8xx-fix-size-given-to-set_huge_pte_at.patch removed from -mm tree
@ 2024-07-12 22:54 Andrew Morton
  0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2024-07-12 22:54 UTC (permalink / raw)
  To: mm-commits, peterx, osalvador, npiggin, mpe, jgg,
	christophe.leroy, akpm


The quilt patch titled
     Subject: powerpc/8xx: fix size given to set_huge_pte_at()
has been removed from the -mm tree.  Its filename was
     powerpc-8xx-fix-size-given-to-set_huge_pte_at.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 <christophe.leroy@csgroup.eu>
Subject: powerpc/8xx: fix size given to set_huge_pte_at()
Date: Tue, 2 Jul 2024 15:51:24 +0200

set_huge_pte_at() expects the size of the hugepage as an int, not the
psize which is the index of the page definition in table mmu_psize_defs[]

Link: https://lkml.kernel.org/r/97f2090011e25d99b6b0aae73e22e1b921c5d1fb.1719928057.git.christophe.leroy@csgroup.eu
Fixes: 935d4f0c6dc8 ("mm: hugetlb: add huge page size param to set_huge_pte_at()")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/mm/nohash/8xx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/arch/powerpc/mm/nohash/8xx.c~powerpc-8xx-fix-size-given-to-set_huge_pte_at
+++ a/arch/powerpc/mm/nohash/8xx.c
@@ -94,7 +94,8 @@ static int __ref __early_map_kernel_huge
 		return -EINVAL;
 
 	set_huge_pte_at(&init_mm, va, ptep,
-			pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot)), psize);
+			pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot)),
+			1UL << mmu_psize_to_shift(psize));
 
 	return 0;
 }
_

Patches currently in -mm which might be from christophe.leroy@csgroup.eu are



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-07-12 22:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 22:54 [merged mm-stable] powerpc-8xx-fix-size-given-to-set_huge_pte_at.patch removed from -mm tree Andrew Morton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.