From owner-svn-src-all@FreeBSD.ORG Wed Sep 4 04:11:39 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A7004F93; Wed, 4 Sep 2013 04:11:39 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7B5C2282B; Wed, 4 Sep 2013 04:11:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r844BdAb065350; Wed, 4 Sep 2013 04:11:39 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r844BdG5065348; Wed, 4 Sep 2013 04:11:39 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201309040411.r844BdG5065348@svn.freebsd.org> From: Justin Hibbits Date: Wed, 4 Sep 2013 04:11:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255199 - head/sys/dev/hwpmc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Sep 2013 04:11:39 -0000 Author: jhibbits Date: Wed Sep 4 04:11:38 2013 New Revision: 255199 URL: http://svnweb.freebsd.org/changeset/base/255199 Log: Fix hwpmc(4) for 32-bit PowerPC. Modified: head/sys/dev/hwpmc/hwpmc_powerpc.c head/sys/dev/hwpmc/hwpmc_powerpc.h Modified: head/sys/dev/hwpmc/hwpmc_powerpc.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_powerpc.c Tue Sep 3 23:34:04 2013 (r255198) +++ head/sys/dev/hwpmc/hwpmc_powerpc.c Wed Sep 4 04:11:38 2013 (r255199) @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include #include /* 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 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); Modified: head/sys/dev/hwpmc/hwpmc_powerpc.h ============================================================================== --- head/sys/dev/hwpmc/hwpmc_powerpc.h Tue Sep 3 23:34:04 2013 (r255198) +++ head/sys/dev/hwpmc/hwpmc_powerpc.h Wed Sep 4 04:11:38 2013 (r255199) @@ -51,7 +51,6 @@ struct powerpc_cpu { extern struct powerpc_cpu **powerpc_pcpu; extern int pmc_mpc7xxx_initialize(struct pmc_mdep *pmc_mdep); -extern int pmc_ppc970_initialize(struct pmc_mdep *pmc_mdep); extern int powerpc_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc); extern int powerpc_get_config(int cpu, int ri, struct pmc **ppm);