From owner-p4-projects@FreeBSD.ORG  Wed Dec 14 20:37:12 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3CC6D16A422; Wed, 14 Dec 2005 20:37:12 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1523B16A41F
	for <perforce@freebsd.org>; Wed, 14 Dec 2005 20:37:12 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 88A9343D46
	for <perforce@freebsd.org>; Wed, 14 Dec 2005 20:37:11 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEKbBhR089498
	for <perforce@freebsd.org>; Wed, 14 Dec 2005 20:37:11 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEKbBD4089495
	for perforce@freebsd.org; Wed, 14 Dec 2005 20:37:11 GMT
	(envelope-from cognet@freebsd.org)
Date: Wed, 14 Dec 2005 20:37:11 GMT
Message-Id: <200512142037.jBEKbBD4089495@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 88193 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: Wed, 14 Dec 2005 20:37:13 -0000

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

Change 88193 by cognet@cognet on 2005/12/14 20:36:33

	Of course Warner was right. We need to check the pc against 
	KERNPHYSADDR if KERNPHYSADDR > KERNVIRTADDR

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/locore.S#14 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/locore.S#14 (text+ko) ====

@@ -201,17 +201,19 @@
 	subs	r2, r2, #4
 	bgt	.L1
 
+	mov	r0, pc
+#if	KERNVIRTADDR > KERNPHYSADDR
 	ldr	r4, =KERNVIRTADDR
-	mov	r0, pc
 	cmp	r0, r4
-#if	KERNVIRTADDR > KERNPHYSADDR
 	bgt	virt_done
 	ldr	r5, =KERNPHYSADDR
 	sub	r4, r4, r5
 	add	pc, pc, r4
 #else
+	ldr	r5, =KERNPHYSADDR
+	cmp	r0, r4
 	blt	virt_done
-	ldr	r5, =KERNPHYSADDR
+	ldr	r4, =KERNVIRTADDR
 	sub	r5, r5, r4
 	sub	pc, pc, r5
 #endif