From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 18:27:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D2E8B1065675; Fri,  4 Apr 2008 18:27:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9443D106564A
	for <perforce@freebsd.org>; Fri,  4 Apr 2008 18:27:20 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E44D8FC21
	for <perforce@freebsd.org>; Fri,  4 Apr 2008 18:27:20 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34IRKMf090056
	for <perforce@freebsd.org>; Fri, 4 Apr 2008 18:27:20 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34IRKic090054
	for perforce@freebsd.org; Fri, 4 Apr 2008 18:27:20 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 4 Apr 2008 18:27:20 GMT
Message-Id: <200804041827.m34IRKic090054@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139356 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Apr 2008 18:27:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=139356

Change 139356 by imp@imp_paco-paco on 2008/04/04 18:26:24

	IFC @139355

Affected files ...

.. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#12 integrate

Differences ...

==== //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#12 (text+ko) ====

@@ -47,7 +47,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.23 2008/04/03 16:44:50 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.24 2008/04/04 18:22:16 imp Exp $");
 
 #include "opt_md.h"
 
@@ -225,7 +225,7 @@
 	boothowto = RB_VERBOSE | RB_SINGLE;
 	cninit();
 	set_cpufuncs();
-	lastaddr = fake_reload_metadata();
+	lastaddr = fake_preload_metadata();
 	physmem = memsize / PAGE_SIZE;
 	pc = &__pcpu;
 	pcpu_init(pc, 0, sizeof(struct pcpu));