Kernel hooks to support PMC sampling modes.

Reviewed by:	alc

3 files changed, 6 insertions, 3 deletions

diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
index cd3db04..1eb987d 100644
--- a/sys/dev/hwpmc/hwpmc_amd.c
+++ b/sys/dev/hwpmc/hwpmc_amd.c
@@ -739,7 +739,7 @@ amd_stop_pmc(int cpu, int ri)
  */
 
 static int
-amd_intr(int cpu, uintptr_t eip)
+amd_intr(int cpu, uintptr_t eip, int usermode)
 {
 	int i, retval;
 	enum pmc_mode mode;
@@ -748,6 +748,8 @@ amd_intr(int cpu, uintptr_t eip)
 	struct pmc_cpu *pc;
 	struct pmc_hw *phw;
 
+	(void) usermode;
+
 	KASSERT(cpu >= 0 && cpu < mp_ncpus,
 	    ("[amd,%d] out of range CPU %d", __LINE__, cpu));
 
diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c
index e81e4e4..c9ade03 100644
--- a/sys/dev/hwpmc/hwpmc_piv.c
+++ b/sys/dev/hwpmc/hwpmc_piv.c
@@ -1452,7 +1452,7 @@ p4_lapic_enable_pmc_interrupt(void)
 
 
 static int
-p4_intr(int cpu, uintptr_t eip)
+p4_intr(int cpu, uintptr_t eip, int usermode)
 {
 	int i, pmc_interrupted;
 	uint32_t cccrval, pmi_ovf_mask;
@@ -1462,6 +1462,7 @@ p4_intr(int cpu, uintptr_t eip)
 	pmc_value_t v;
 
 	(void) eip;
+	(void) usermode;
 	PMCDBG(MDP,INT, 1, "cpu=%d eip=%x pcint=0x%x", cpu, eip,
 	    lapic->lvt_pcint);
 
diff --git a/sys/dev/hwpmc/hwpmc_ppro.c b/sys/dev/hwpmc/hwpmc_ppro.c
index 13f9195..370e6e5 100644
--- a/sys/dev/hwpmc/hwpmc_ppro.c
+++ b/sys/dev/hwpmc/hwpmc_ppro.c
@@ -672,7 +672,7 @@ p6_stop_pmc(int cpu, int ri)
 }
 
 static int
-p6_intr(int cpu, uintptr_t eip)
+p6_intr(int cpu, uintptr_t eip, int usermode)
 {
 	(void) cpu;
 	(void) eip;