From owner-svn-src-head@FreeBSD.ORG Sun Aug 31 08:58:55 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A04FB38; Sun, 31 Aug 2014 08:58:55 +0000 (UTC) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C55D51BB6; Sun, 31 Aug 2014 08:58:54 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id B6CDE25D3A81; Sun, 31 Aug 2014 08:58:52 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 31A87C770B2; Sun, 31 Aug 2014 08:58:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id ZuaHPaBPiFbI; Sun, 31 Aug 2014 08:58:50 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:f973:5b8d:9a90:cf0f] (unknown [IPv6:fde9:577b:c1a9:4410:f973:5b8d:9a90:cf0f]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 47950C770B1; Sun, 31 Aug 2014 08:58:48 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r270862 - head/sys/arm/arm From: "Bjoern A. Zeeb" In-Reply-To: <201408302221.s7UMLvMS003791@svn.freebsd.org> Date: Sun, 31 Aug 2014 08:58:38 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201408302221.s7UMLvMS003791@svn.freebsd.org> To: Ian Lepore X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2014 08:58:55 -0000 On 30 Aug 2014, at 22:21 , Ian Lepore wrote: > Author: ian > Date: Sat Aug 30 22:21:57 2014 > New Revision: 270862 > URL: http://svnweb.freebsd.org/changeset/base/270862 >=20 > Log: > Fix the handling of MMU type in the AP entry code. The ARM_MMU_V6/V7 > symbols are always #defined to 0 or 1, so use #if SYM not #if = defined(SYM). > Also, it helps if you include the header file that defines the = symbols. I can only assume it=92s been due to this commit: 22 warnings generated. linking kernel.debug locore.o: In function `mpentry': (.text+0x1ec): undefined reference to `armv6_idcache_inv_all' --- kernel.debug --- *** [kernel.debug] Error code 1 bmake: stopped in = /storage/head/obj/arm.armv6/scratch/tmp/bz/head.svn/sys/ARMADAXP >=20 > Modified: > head/sys/arm/arm/locore.S >=20 > Modified: head/sys/arm/arm/locore.S > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/arm/locore.S Sat Aug 30 21:44:32 2014 = (r270861) > +++ head/sys/arm/arm/locore.S Sat Aug 30 22:21:57 2014 = (r270862) > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > #include >=20 > __FBSDID("$FreeBSD$"); > @@ -389,9 +390,9 @@ ASENTRY_NP(mpentry) > nop > CPWAIT(r0) >=20 > -#if defined(ARM_MMU_V6) > +#if ARM_MMU_V6 > bl armv6_idcache_inv_all /* Modifies r0 only */ > -#elif defined(ARM_MMU_V7) > +#elif ARM_MMU_V7 > bl armv7_idcache_inv_all /* Modifies r0-r3, ip */ > #endif >=20 >=20 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983