From owner-svn-src-head@FreeBSD.ORG  Tue Mar 31 23:06:20 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 76E3A1065673;
	Tue, 31 Mar 2009 23:06:20 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65E418FC24;
	Tue, 31 Mar 2009 23:06:20 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2VN6KB8012460;
	Tue, 31 Mar 2009 23:06:20 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2VN6KBd012459;
	Tue, 31 Mar 2009 23:06:20 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <200903312306.n2VN6KBd012459@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Tue, 31 Mar 2009 23:06:20 +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: r190602 - head/sys/arm/arm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2009 23:06:20 -0000

Author: cognet
Date: Tue Mar 31 23:06:20 2009
New Revision: 190602
URL: http://svn.freebsd.org/changeset/base/190602

Log:
  Use Oxf0000000 instead of 0xff000000 to guess the physical address, relative
  to the virtual one. I may had a reason at some point to use the later, but
  can't remember which, and it can leads to issues.
  
  Reported by:	Guillaume Ballet <gballet gmail com>

Modified:
  head/sys/arm/arm/locore.S

Modified: head/sys/arm/arm/locore.S
==============================================================================
--- head/sys/arm/arm/locore.S	Tue Mar 31 23:02:51 2009	(r190601)
+++ head/sys/arm/arm/locore.S	Tue Mar 31 23:06:20 2009	(r190602)
@@ -110,7 +110,7 @@ from_ram:
 	nop
 #endif
 	adr	r7, Lunmapped
-	bic     r7, r7, #0xff000000
+	bic     r7, r7, #0xf0000000
 	orr     r7, r7, #PHYSADDR
 
 
@@ -144,7 +144,7 @@ Lunmapped:
 	ldmia	r4!, {r1,r2,r3}   /* # of sections, VA, PA|attr */
 	cmp	r1, #0
 	adrne	r5, 2b
-	bicne	r5, r5, #0xff000000
+	bicne	r5, r5, #0xf0000000
 	orrne	r5, r5, #PHYSADDR
 	movne	pc, r5