Module Name: src Committed By: matt Date: Tue Sep 16 22:29:10 UTC 2014
Modified Files: src/sys/arch/arm/cortex: a9_mpsubr.S Log Message: Always set SMP on the A7 since it's needed for ldrex/strex To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/cortex/a9_mpsubr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/cortex/a9_mpsubr.S diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.22 src/sys/arch/arm/cortex/a9_mpsubr.S:1.23 --- src/sys/arch/arm/cortex/a9_mpsubr.S:1.22 Tue Sep 16 22:00:22 2014 +++ src/sys/arch/arm/cortex/a9_mpsubr.S Tue Sep 16 22:29:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: a9_mpsubr.S,v 1.22 2014/09/16 22:00:22 matt Exp $ */ +/* $NetBSD: a9_mpsubr.S,v 1.23 2014/09/16 22:29:09 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -443,7 +443,9 @@ cortex_init: mcr p15, 0, r1, c8, c7, 0 // TLBIALL (just this core) #endif -#if defined(MULTIPROCESSOR) + // For the A7, SMP must be on ldrex/strex to work. + // +#if defined(MULTIPROCESSOR) || defined(CPU_CORTEXA7) #if defined(CPU_CORTEXA5) || defined(CPU_CORTEXA7) || defined(CPU_CORTEXA9) // // Step 4a, set ACTLR.SMP=1