git: 927a2f62980b - stable/13 - hwpmc: remove pmd_pcpu_{init,fini} callbacks
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 09 Jun 2023 19:58:15 UTC
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=927a2f62980b69f2bf95c9e3c0424458d06f3886
commit 927a2f62980b69f2bf95c9e3c0424458d06f3886
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-05-05 21:59:33 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-06-09 19:48:06 +0000
hwpmc: remove pmd_pcpu_{init,fini} callbacks
These are unused on all platforms.
Reviewed by: jkoshy, emaste
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D39912
(cherry picked from commit 772b2dc3abc5072743e7598d35e0a8ad621e7b0d)
---
sys/dev/hwpmc/hwpmc_amd.c | 2 --
sys/dev/hwpmc/hwpmc_core.c | 3 ---
sys/dev/hwpmc/hwpmc_mod.c | 6 ------
sys/sys/pmc.h | 4 ----
4 files changed, 15 deletions(-)
diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
index 36411da871ea..26ea46d3fc9f 100644
--- a/sys/dev/hwpmc/hwpmc_amd.c
+++ b/sys/dev/hwpmc/hwpmc_amd.c
@@ -1146,8 +1146,6 @@ pmc_amd_initialize(void)
pcd->pcd_stop_pmc = amd_stop_pmc;
pcd->pcd_write_pmc = amd_write_pmc;
- pmc_mdep->pmd_pcpu_init = NULL;
- pmc_mdep->pmd_pcpu_fini = NULL;
pmc_mdep->pmd_intr = amd_intr;
pmc_mdep->pmd_switch_in = amd_switch_in;
pmc_mdep->pmd_switch_out = amd_switch_out;
diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
index d80edeefb0d0..02165898aeed 100644
--- a/sys/dev/hwpmc/hwpmc_core.c
+++ b/sys/dev/hwpmc/hwpmc_core.c
@@ -1248,9 +1248,6 @@ pmc_core_initialize(struct pmc_mdep *md, int maxcpu, int version_override)
else
md->pmd_intr = core_intr;
- md->pmd_pcpu_fini = NULL;
- md->pmd_pcpu_init = NULL;
-
return (0);
}
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index fb8679f65a38..1ff427a1e965 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -5492,8 +5492,6 @@ pmc_generic_cpu_initialize(void)
md->pmd_cputype = PMC_CPU_GENERIC;
- md->pmd_pcpu_init = NULL;
- md->pmd_pcpu_fini = NULL;
md->pmd_switch_in = generic_switch_in;
md->pmd_switch_out = generic_switch_out;
@@ -5626,8 +5624,6 @@ pmc_initialize(void)
pmc_pcpu[cpu] = malloc(sizeof(struct pmc_cpu) +
md->pmd_npmc * sizeof(struct pmc_hw *), M_PMC,
M_WAITOK|M_ZERO);
- if (md->pmd_pcpu_init)
- error = md->pmd_pcpu_init(md, cpu);
for (n = 0; error == 0 && n < md->pmd_nclass; n++)
error = md->pmd_classdep[n].pcd_pcpu_init(md, cpu);
}
@@ -5865,8 +5861,6 @@ pmc_cleanup(void)
pmc_select_cpu(cpu);
for (c = 0; c < md->pmd_nclass; c++)
md->pmd_classdep[c].pcd_pcpu_fini(md, cpu);
- if (md->pmd_pcpu_fini)
- md->pmd_pcpu_fini(md, cpu);
}
if (md->pmd_cputype == PMC_CPU_GENERIC)
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index b771dac81e93..1983dbb91578 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1046,10 +1046,6 @@ struct pmc_mdep {
* Machine dependent methods.
*/
- /* per-cpu initialization and finalization */
- int (*pmd_pcpu_init)(struct pmc_mdep *_md, int _cpu);
- int (*pmd_pcpu_fini)(struct pmc_mdep *_md, int _cpu);
-
/* thread context switch in/out */
int (*pmd_switch_in)(struct pmc_cpu *_p, struct pmc_process *_pp);
int (*pmd_switch_out)(struct pmc_cpu *_p, struct pmc_process *_pp);