From owner-svn-src-all@FreeBSD.ORG  Wed Feb 11 10:37:56 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E5C9410C;
 Wed, 11 Feb 2015 10:37:56 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D0ADCB59;
 Wed, 11 Feb 2015 10:37:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BAbuFF008696;
 Wed, 11 Feb 2015 10:37:56 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BAbuCk008694;
 Wed, 11 Feb 2015 10:37:56 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201502111037.t1BAbuCk008694@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 11 Feb 2015 10:37:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278577 - in head/sys: arm/xscale/ixp425 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.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 10:37:57 -0000

Author: andrew
Date: Wed Feb 11 10:37:55 2015
New Revision: 278577
URL: https://svnweb.freebsd.org/changeset/base/278577

Log:
  The cpu_id macro was renamed in r278529, catch up with this new name.

Modified:
  head/sys/arm/xscale/ixp425/if_npe.c
  head/sys/dev/hwpmc/hwpmc_armv7.c

Modified: head/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npe.c	Wed Feb 11 09:21:36 2015	(r278576)
+++ head/sys/arm/xscale/ixp425/if_npe.c	Wed Feb 11 10:37:55 2015	(r278577)
@@ -285,7 +285,7 @@ unit2npeid(int unit)
 	};
 	/* XXX check feature register instead */
 	return (unit < 3 ? npeidmap[
-	    (cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
+	    (cpu_ident() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
 }
 
 static int

Modified: head/sys/dev/hwpmc/hwpmc_armv7.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_armv7.c	Wed Feb 11 09:21:36 2015	(r278576)
+++ head/sys/dev/hwpmc/hwpmc_armv7.c	Wed Feb 11 10:37:55 2015	(r278577)
@@ -555,7 +555,7 @@ armv7_pcpu_init(struct pmc_mdep *md, int
 	armv7_pcpu[cpu] = pac = malloc(sizeof(struct armv7_cpu), M_PMC,
 	    M_WAITOK|M_ZERO);
 
-	cpuid = cpu_id();
+	cpuid = cpu_ident();
 	pac->cortex_ver = (cpuid >> CPU_ID_CORTEX_VER_SHIFT) & \
 				CPU_ID_CORTEX_VER_MASK;