From owner-svn-src-all@freebsd.org  Sat Jul 18 20:19:52 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 701639A5D73;
 Sat, 18 Jul 2015 20:19:52 +0000 (UTC) (envelope-from jmg@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 607AB1B19;
 Sat, 18 Jul 2015 20:19:52 +0000 (UTC) (envelope-from jmg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6IKJq3T054350;
 Sat, 18 Jul 2015 20:19:52 GMT (envelope-from jmg@FreeBSD.org)
Received: (from jmg@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6IKJq8B054349;
 Sat, 18 Jul 2015 20:19:52 GMT (envelope-from jmg@FreeBSD.org)
Message-Id: <201507182019.t6IKJq8B054349@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jmg set sender to jmg@FreeBSD.org
 using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Sat, 18 Jul 2015 20:19:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285681 - head/sys/boot/arm/ixp425/boot2
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.20
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: Sat, 18 Jul 2015 20:19:52 -0000

Author: jmg
Date: Sat Jul 18 20:19:51 2015
New Revision: 285681
URL: https://svnweb.freebsd.org/changeset/base/285681

Log:
  revert r278579, this is in a different compile environment than the
  kernel, and needs to be named cpu_id...
  
  Pointed out by:	Berislav Purgar

Modified:
  head/sys/boot/arm/ixp425/boot2/ixp425_board.c

Modified: head/sys/boot/arm/ixp425/boot2/ixp425_board.c
==============================================================================
--- head/sys/boot/arm/ixp425/boot2/ixp425_board.c	Sat Jul 18 19:59:29 2015	(r285680)
+++ head/sys/boot/arm/ixp425/boot2/ixp425_board.c	Sat Jul 18 20:19:51 2015	(r285681)
@@ -74,7 +74,7 @@ board_init(void)
 {
 	struct board_config **pbp;
 
-	cputype = cpu_ident() & CPU_ID_CPU_MASK;
+	cputype = cpu_id() & CPU_ID_CPU_MASK;
 
 	SET_FOREACH(pbp, boards)
 		/* XXX pass down redboot board type */