From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 24 20:19:29 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8DDB1065670;
	Fri, 24 Feb 2012 20:19:29 +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 B492E8FC14;
	Fri, 24 Feb 2012 20:19:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1OKJTlS082341;
	Fri, 24 Feb 2012 20:19:29 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1OKJTR8082339;
	Fri, 24 Feb 2012 20:19:29 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201202242019.q1OKJTR8082339@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Fri, 24 Feb 2012 20:19:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232129 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Feb 2012 20:19:29 -0000

Author: cognet
Date: Fri Feb 24 20:19:29 2012
New Revision: 232129
URL: http://svn.freebsd.org/changeset/base/232129

Log:
  Rd and Rm should be different in mul

Modified:
  projects/armv6/sys/arm/arm/locore.S

Modified: projects/armv6/sys/arm/arm/locore.S
==============================================================================
--- projects/armv6/sys/arm/arm/locore.S	Fri Feb 24 20:12:53 2012	(r232128)
+++ projects/armv6/sys/arm/arm/locore.S	Fri Feb 24 20:19:29 2012	(r232129)
@@ -303,9 +303,9 @@ ASENTRY_NP(mptramp)
 
 	/* Read boot address for CPU */
 	mov	r1, #0x100
-	mul	r0, r0, r1
+	mul	r2, r0, r1
 	ldr	r1, Lpmureg
-	add	r0, r0, r1
+	add	r0, r2, r1
 	ldr	r1, [r0], #0x00
 
 	mov pc, r1