Date: Sun, 31 Aug 2014 09:24:35 -0600 From: Ian Lepore <ian@FreeBSD.org> To: "Bjoern A. Zeeb" <bz@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r270862 - head/sys/arm/arm Message-ID: <1409498675.1150.198.camel@revolution.hippie.lan> In-Reply-To: <A48AB771-FF81-48C2-A620-E10CA7EC4D35@FreeBSD.org> References: <201408302221.s7UMLvMS003791@svn.freebsd.org> <A48AB771-FF81-48C2-A620-E10CA7EC4D35@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 2014-08-31 at 08:58 +0000, Bjoern A. Zeeb wrote: > On 30 Aug 2014, at 22:21 , Ian Lepore <ian@FreeBSD.org> wrote: >=20 > > 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/V= 7 > > symbols are always #defined to 0 or 1, so use #if SYM not #if define= d(SYM). > > Also, it helps if you include the header file that defines the symbo= ls. >=20 >=20 > I can only assume it=92s been due to this commit: >=20 > 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 >=20 > bmake: stopped in /storage/head/obj/arm.armv6/scratch/tmp/bz/head.svn/s= ys/ARMADAXP >=20 >=20 Yes, apparently this change exposed a long-standing bug in another header file. Fixed in r270878. -- Ian >=20 > >=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 <sys/syscall.h> > > #include <machine/asm.h> > > #include <machine/armreg.h> > > +#include <machine/cpuconf.h> > > #include <machine/pte.h> > >=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 >=20 > =97=20 > Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 198= 3 >=20 >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1409498675.1150.198.camel>