Remove second patch, it's already in upstream
This commit is contained in:
parent
6effe648b9
commit
6b0daf7d92
@ -192,76 +192,6 @@ index 818815e15..f8f39a858 100644
|
||||
2.39.5 (Apple Git-154)
|
||||
|
||||
|
||||
From a8d04f4f09f371e3b4fca9a40e9d3b5a1e0016d3 Mon Sep 17 00:00:00 2001
|
||||
From: Hugh Dickins <hughd@google.com>
|
||||
Date: Thu, 8 Jun 2023 12:22:39 -0700
|
||||
Subject: [PATCH 2/3] powerpc: kvmppc_unmap_free_pmd() pte_offset_kernel()
|
||||
|
||||
kvmppc_unmap_free_pmd() use pte_offset_kernel(), like everywhere else
|
||||
in book3s_64_mmu_radix.c: instead of pte_offset_map(), which will come
|
||||
to need a pte_unmap() to balance it.
|
||||
|
||||
But note that this is a more complex case than most: see those -EAGAINs
|
||||
in kvmppc_create_pte(), which is coping with kvmppc races beween page
|
||||
table and huge entry, of the kind which we are expecting to address
|
||||
in pte_offset_map() - this might want to be revisited in future.
|
||||
|
||||
Link: https://lkml.kernel.org/r/c76aa421-aec3-4cc8-cc61-4130f2e27e1@google.com
|
||||
Signed-off-by: Hugh Dickins <hughd@google.com>
|
||||
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
|
||||
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>
|
||||
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
|
||||
Cc: Catalin Marinas <catalin.marinas@arm.com>
|
||||
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
Cc: Chris Zankel <chris@zankel.net>
|
||||
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
||||
Cc: David Hildenbrand <david@redhat.com>
|
||||
Cc: "David S. Miller" <davem@davemloft.net>
|
||||
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
|
||||
Cc: Greg Ungerer <gerg@linux-m68k.org>
|
||||
Cc: Heiko Carstens <hca@linux.ibm.com>
|
||||
Cc: Helge Deller <deller@gmx.de>
|
||||
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
||||
Cc: Ingo Molnar <mingo@kernel.org>
|
||||
Cc: John David Anglin <dave.anglin@bell.net>
|
||||
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
||||
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
|
||||
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
|
||||
Cc: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Cc: Michael Ellerman <mpe@ellerman.id.au>
|
||||
Cc: Michal Simek <monstr@monstr.eu>
|
||||
Cc: Mike Kravetz <mike.kravetz@oracle.com>
|
||||
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
|
||||
Cc: Palmer Dabbelt <palmer@dabbelt.com>
|
||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
||||
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
|
||||
Cc: Russell King <linux@armlinux.org.uk>
|
||||
Cc: Suren Baghdasaryan <surenb@google.com>
|
||||
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: Will Deacon <will@kernel.org>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
---
|
||||
arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
|
||||
index e565a84cf..57fe60b51 100644
|
||||
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
|
||||
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
|
||||
@@ -502,7 +502,7 @@ static void kvmppc_unmap_free_pmd(struct kvm *kvm, pmd_t *pmd, bool full,
|
||||
} else {
|
||||
pte_t *pte;
|
||||
|
||||
- pte = pte_offset_map(p, 0);
|
||||
+ pte = pte_offset_kernel(p, 0);
|
||||
kvmppc_unmap_free_pte(kvm, pte, full, lpid);
|
||||
pmd_clear(p);
|
||||
}
|
||||
--
|
||||
2.39.5 (Apple Git-154)
|
||||
|
||||
|
||||
From 8c62d250a23bbbb1ecd84d4d475e7623810275aa Mon Sep 17 00:00:00 2001
|
||||
From: eabdullin <eabdullin@almalinux.org>
|
||||
Date: Tue, 8 Apr 2025 10:13:43 +0300
|
||||
@ -287,4 +217,3 @@ index f38dfe195..16e5872a1 100644
|
||||
stt = kvmppc_find_table(vcpu->kvm, liobn);
|
||||
--
|
||||
2.39.5 (Apple Git-154)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user