Date: Sat, 30 Aug 2014 22:21:57 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270862 - head/sys/arm/arm Message-ID: <201408302221.s7UMLvMS003791@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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. 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408302221.s7UMLvMS003791>