From owner-svn-src-all@freebsd.org  Mon Aug 22 18:33:58 2016
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 0D853BC2556;
 Mon, 22 Aug 2016 18:33:58 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D45CB12C7;
 Mon, 22 Aug 2016 18:33:57 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MIXvDZ060162;
 Mon, 22 Aug 2016 18:33:57 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MIXvLN060161;
 Mon, 22 Aug 2016 18:33:57 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201608221833.u7MIXvLN060161@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Mon, 22 Aug 2016 18:33:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304623 - head/sys/arm/arm
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.22
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2016 18:33:58 -0000

Author: manu
Date: Mon Aug 22 18:33:56 2016
New Revision: 304623
URL: https://svnweb.freebsd.org/changeset/base/304623

Log:
  Fix building for ARM kernel that have FLASHADDR, PHYSADDR and LOADERRAMADDR defined.
  
  Pointy Hat: myself
  
  Reported by:	bz

Modified:
  head/sys/arm/arm/elf_trampoline.c

Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c	Mon Aug 22 18:19:46 2016	(r304622)
+++ head/sys/arm/arm/elf_trampoline.c	Mon Aug 22 18:33:56 2016	(r304623)
@@ -228,7 +228,7 @@ _startC(unsigned r0, unsigned r1, unsign
 		    "mov pc, %0\n"
 		    : : "r" (target_addr), "r" (tmp_sp),
 		    "r" (s_boot_params.abp_r0), "r" (s_boot_params.abp_r1),
-		    "r" (s_boot_params.abp_r2), "r" (s_boot_params.abp_r3),
+		    "r" (s_boot_params.abp_r2), "r" (s_boot_params.abp_r3)
 		    : "r0", "r1", "r2", "r3");
 
 	}