KVM: PPC: Book3S HV: Make PMU save/restore symbols global for module builds

This commit is contained in:
eabdullin 2026-04-04 12:45:12 +03:00
parent 795df5785a
commit 1d22e68a42
2 changed files with 57 additions and 0 deletions

View File

@ -21,6 +21,9 @@ actions:
- type: "patch"
name: "0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch"
number: 2007
- type: "patch"
name: "0001-Make-KVM-PMU-symbols-global-for-ppc64le-module-build.patch"
number: 2008
- type: "source"
name: "almalinuxdup1.x509"
number: 100
@ -470,3 +473,4 @@ actions:
- "Use AlmaLinux OS secure boot cert"
- "Debrand for AlmaLinux OS"
- "Add KVM support for ppc64le"
- "KVM: PPC: Book3S HV: Make PMU save/restore symbols global for module builds"

View File

@ -0,0 +1,53 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eduard Abdullin <eabdullin@almalinux.org>
Date: Sun, 6 Apr 2026 00:00:00 +0000
Subject: [PATCH] KVM: PPC: Book3S HV: Make PMU save/restore symbols global for
module builds
---
arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -2788,7 +2788,7 @@
/*
* Load up guest PMU state. R3 points to the vcpu struct.
*/
-SYM_FUNC_START_LOCAL(kvmhv_load_guest_pmu)
+SYM_FUNC_START(kvmhv_load_guest_pmu)
EXPORT_SYMBOL_GPL(kvmhv_load_guest_pmu)
mr r4, r3
mflr r0
@@ -2854,7 +2854,7 @@
/*
* Reload host PMU state saved in the PACA by kvmhv_save_host_pmu.
*/
-SYM_FUNC_START_LOCAL(kvmhv_load_host_pmu)
+SYM_FUNC_START(kvmhv_load_host_pmu)
EXPORT_SYMBOL_GPL(kvmhv_load_host_pmu)
mflr r0
lbz r4, PACA_PMCINUSE(r13) /* is the host using the PMU? */
@@ -2911,7 +2911,7 @@
* Save guest PMU state into the vcpu struct.
* r3 = vcpu, r4 = full save flag (PMU in use flag set in VPA)
*/
-SYM_FUNC_START_LOCAL(kvmhv_save_guest_pmu)
+SYM_FUNC_START(kvmhv_save_guest_pmu)
EXPORT_SYMBOL_GPL(kvmhv_save_guest_pmu)
mr r9, r3
mr r8, r4
diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S
--- a/arch/powerpc/kvm/book3s_hv_interrupts.S
+++ b/arch/powerpc/kvm/book3s_hv_interrupts.S
@@ -105,7 +105,7 @@
mtlr r0
blr
-SYM_FUNC_START_LOCAL(kvmhv_save_host_pmu)
+SYM_FUNC_START(kvmhv_save_host_pmu)
BEGIN_FTR_SECTION
/* Work around P8 PMAE bug */
li r3, -1