Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm/fdt Only free the _init_memory pages if all ...



details:   https://anonhg.NetBSD.org/src/rev/def3c9f635c8
branches:  trunk
changeset: 448370:def3c9f635c8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jan 31 13:26:21 2019 +0000

description:
Only free the _init_memory pages if all APs start corectly.

diffstat:

 sys/arch/evbarm/fdt/fdt_machdep.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 592647902cf9 -r def3c9f635c8 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Thu Jan 31 13:19:19 2019 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Thu Jan 31 13:26:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.57 2018/12/23 11:45:39 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.58 2019/01/31 13:26:21 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.57 2018/12/23 11:45:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.58 2019/01/31 13:26:21 skrll Exp $");
 
 #include "opt_machdep.h"
 #include "opt_bootconfig.h"
@@ -545,12 +545,15 @@
        u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, fdt_physmem,
             nfdt_physmem);
 
+       error = 0;
        if ((boothowto & RB_MD1) == 0) {
                VPRINTF("mpstart\n");
                if (plat->ap_mpstart)
-                       plat->ap_mpstart();
+                       error = plat->ap_mpstart();
        }
 
+       if (error)
+               return sp;
        /*
         * Now we have APs started the pages used for stacks and L1PT can
         * be given to uvm



Home | Main Index | Thread Index | Old Index