? sys/arch/arm/trustzone ? sys/arch/arm/samsung/exynos5_reg.h.check Index: sys/arch/arm/arm/cpufunc.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/arm/cpufunc.c,v retrieving revision 1.147 diff -u -p -r1.147 cpufunc.c --- sys/arch/arm/arm/cpufunc.c 18 Apr 2014 23:50:59 -0000 1.147 +++ sys/arch/arm/arm/cpufunc.c 10 Jun 2014 10:32:19 -0000 @@ -3115,8 +3115,7 @@ armv7_setup(char *args) #endif | CPU_CONTROL_UNAL_ENABLE; - int cpuctrlmask = cpuctrl | CPU_CONTROL_AFLT_ENABLE; - + int cpuctrlmask = cpuctrl; cpuctrl = parse_cpu_options(args, armv7_options, cpuctrl);