svn commit: r270862 - head/sys/arm/arm

[Ian Lepore]

On Sun, 2014-08-31 at 08:58 +0000, Bjoern A. Zeeb wrote:
> On 30 Aug 2014, at 22:21 , Ian Lepore <ian at FreeBSD.org> wrote:
> 
> > Author: ian
> > Date: Sat Aug 30 22:21:57 2014
> > New Revision: 270862
> > URL: http://svnweb.freebsd.org/changeset/base/270862
> > 
> > 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’s 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
> 
> 

Yes, apparently this change exposed a long-standing bug in another
header file.  Fixed in r270878.

-- Ian

> 
> > 
> > Modified:
> >  head/sys/arm/arm/locore.S
> > 
> > Modified: head/sys/arm/arm/locore.S
> > ==============================================================================
> > --- 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>
> > 
> > __FBSDID("$FreeBSD$");
> > @@ -389,9 +390,9 @@ ASENTRY_NP(mpentry)
> > 	nop
> > 	CPWAIT(r0)
> > 
> > -#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
> > 
> > 
> 
> — 
> Bjoern A. Zeeb             "Come on. Learn, goddamn it.", WarGames, 1983
> 
>