diff options
| author | jhibbits <jhibbits@FreeBSD.org> | 2013-09-04 04:11:38 +0000 |
|---|---|---|
| committer | jhibbits <jhibbits@FreeBSD.org> | 2013-09-04 04:11:38 +0000 |
| commit | 6fc9e86bed06cceacd24183cdcc5260109b6050a (patch) | |
| tree | edde4672f287ce7fb75b0e778aca22d0d9ac4432 /sys/dev/hwpmc/hwpmc_powerpc.c | |
| parent | 297fdff2ee7de617834750c5c0bccefb87ab0374 (diff) | |
| download | FreeBSD-src-6fc9e86bed06cceacd24183cdcc5260109b6050a.zip FreeBSD-src-6fc9e86bed06cceacd24183cdcc5260109b6050a.tar.gz | |
Fix hwpmc(4) for 32-bit PowerPC.
Diffstat (limited to 'sys/dev/hwpmc/hwpmc_powerpc.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_powerpc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c index a6453ec..c7d8f3d 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.c +++ b/sys/dev/hwpmc/hwpmc_powerpc.c @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$"); #include <machine/pmc_mdep.h> #include <machine/spr.h> +#include <machine/pte.h> +#include <machine/sr.h> #include <machine/cpu.h> #include <machine/vmparam.h> /* For VM_MIN_KERNEL_ADDRESS/VM_MAX_KERNEL_ADDRESS */ @@ -44,11 +46,6 @@ __FBSDID("$FreeBSD$"); #define INKERNEL(x) (((vm_offset_t)(x)) <= VM_MAX_KERNEL_ADDRESS && \ ((vm_offset_t)(x)) >= VM_MIN_KERNEL_ADDRESS) -/* - * Per-processor information. - */ -static unsigned int ppc_npmcs; - int pmc_save_kernel_callchain(uintptr_t *cc, int maxsamples, struct trapframe *tf) @@ -89,8 +86,6 @@ powerpc_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[powerpc,%d], illegal CPU %d", __LINE__, cpu)); - KASSERT(ri >= 0 && ri < ppc_npmcs, - ("[powerpc,%d] row-index %d out of range", __LINE__, ri)); phw = &powerpc_pcpu[cpu]->pc_ppcpmcs[ri]; snprintf(powerpc_name, sizeof(powerpc_name), "POWERPC-%d", ri); |
