[src/netbsd-7]: src/sys/arch/arm/arm32 Pull up following revision(s) (request...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/280c2347cd26
branches:  netbsd-7
changeset: 798703:280c2347cd26
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 13 19:32:43 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #319):
        sys/arch/arm/arm32/arm32_boot.c: revision 1.11
serialize printing of secondary cpu info

diffstat:

 sys/arch/arm/arm32/arm32_boot.c |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r adc5421c71dc -r 280c2347cd26 sys/arch/arm/arm32/arm32_boot.c
--- a/sys/arch/arm/arm32/arm32_boot.c   Sat Dec 13 19:29:28 2014 +0000
+++ b/sys/arch/arm/arm32/arm32_boot.c   Sat Dec 13 19:32:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_boot.c,v 1.7.4.1 2014/11/09 16:05:25 martin Exp $        */
+/*     $NetBSD: arm32_boot.c,v 1.7.4.2 2014/12/13 19:32:43 martin Exp $        */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -123,7 +123,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.7.4.1 2014/11/09 16:05:25 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.7.4.2 2014/12/13 19:32:43 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -151,6 +151,10 @@
 #include <sys/kgdb.h>
 #endif
 
+#ifdef MULTIPROCESSOR
+static kmutex_t cpu_hatch_lock;
+#endif
+
 vaddr_t
 initarm_common(vaddr_t kvm_base, vsize_t kvm_size,
        const struct boot_physmem *bp, size_t nbp)
@@ -300,6 +304,10 @@
                Debugger();
 #endif
 
+#ifdef MULTIPROCESSOR
+       mutex_init(&cpu_hatch_lock, MUTEX_DEFAULT, IPL_HIGH);
+#endif
+
 #ifdef VERBOSE_INIT_ARM
        printf("done.\n");
 #endif
@@ -383,6 +391,8 @@
        }
 #endif
 
+       mutex_enter(&cpu_hatch_lock);
+
        aprint_naive("%s", device_xname(ci->ci_dev));
        aprint_normal("%s", device_xname(ci->ci_dev));
        identify_arm_cpu(ci->ci_dev, ci);
@@ -391,6 +401,8 @@
 #endif
        vfp_attach(ci);
 
+       mutex_exit(&cpu_hatch_lock);
+
 #ifdef VERBOSE_INIT_ARM
        printf(" interrupts");
 #endif