Date: Sun, 31 Aug 2014 08:58:38 +0000 From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Ian Lepore <ian@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: <A48AB771-FF81-48C2-A620-E10CA7EC4D35@FreeBSD.org> In-Reply-To: <201408302221.s7UMLvMS003791@svn.freebsd.org> References: <201408302221.s7UMLvMS003791@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 30 Aug 2014, at 22:21 , Ian Lepore <ian@FreeBSD.org> 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 <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 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A48AB771-FF81-48C2-A620-E10CA7EC4D35>