From owner-svn-src-all@FreeBSD.ORG Thu Mar 22 18:07:44 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7613106566B; Thu, 22 Mar 2012 18:07:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A1C08FC26; Thu, 22 Mar 2012 18:07:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2MI7iOi035566; Thu, 22 Mar 2012 18:07:44 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2MI7iVU035564; Thu, 22 Mar 2012 18:07:44 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201203221807.q2MI7iVU035564@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Thu, 22 Mar 2012 18:07:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233320 - head/lib/libpmc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 22 Mar 2012 18:07:44 -0000 Author: gonzo Date: Thu Mar 22 18:07:44 2012 New Revision: 233320 URL: http://svn.freebsd.org/changeset/base/233320 Log: Make reusable part of code have mips prefix, not mips24 Modified: head/lib/libpmc/libpmc.c Modified: head/lib/libpmc/libpmc.c ============================================================================== --- head/lib/libpmc/libpmc.c Thu Mar 22 18:01:23 2012 (r233319) +++ head/lib/libpmc/libpmc.c Thu Mar 22 18:07:44 2012 (r233320) @@ -79,7 +79,7 @@ static int xscale_allocate_pmc(enum pmc_ #endif #if defined(__mips__) -static int mips24k_allocate_pmc(enum pmc_event _pe, char* ctrspec, +static int mips_allocate_pmc(enum pmc_event _pe, char* ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif /* __mips__ */ @@ -279,7 +279,7 @@ PMC_CLASS_TABLE_DESC(xscale, XSCALE, xsc #endif #if defined(__mips__) -PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips24k); +PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips); #endif /* __mips__ */ #if defined(__powerpc__) @@ -2208,12 +2208,12 @@ static struct pmc_event_alias mips24k_al EV_ALIAS(NULL, NULL) }; -#define MIPS24K_KW_OS "os" -#define MIPS24K_KW_USR "usr" -#define MIPS24K_KW_ANYTHREAD "anythread" +#define MIPS_KW_OS "os" +#define MIPS_KW_USR "usr" +#define MIPS_KW_ANYTHREAD "anythread" static int -mips24k_allocate_pmc(enum pmc_event pe, char *ctrspec __unused, +mips_allocate_pmc(enum pmc_event pe, char *ctrspec __unused, struct pmc_op_pmcallocate *pmc_config __unused) { char *p; @@ -2223,11 +2223,11 @@ mips24k_allocate_pmc(enum pmc_event pe, pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); while ((p = strsep(&ctrspec, ",")) != NULL) { - if (KWMATCH(p, MIPS24K_KW_OS)) + if (KWMATCH(p, MIPS_KW_OS)) pmc_config->pm_caps |= PMC_CAP_SYSTEM; - else if (KWMATCH(p, MIPS24K_KW_USR)) + else if (KWMATCH(p, MIPS_KW_USR)) pmc_config->pm_caps |= PMC_CAP_USER; - else if (KWMATCH(p, MIPS24K_KW_ANYTHREAD)) + else if (KWMATCH(p, MIPS_KW_ANYTHREAD)) pmc_config->pm_caps |= (PMC_CAP_USER | PMC_CAP_SYSTEM); else return (-1); @@ -2235,6 +2235,7 @@ mips24k_allocate_pmc(enum pmc_event pe, return (0); } + #endif /* __mips__ */ #if defined(__powerpc__)