Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/pic fix false positive KASSERT.



details:   https://anonhg.NetBSD.org/src/rev/c346fbd97a8f
branches:  trunk
changeset: 323930:c346fbd97a8f
user:      ryo <ryo%NetBSD.org@localhost>
date:      Mon Jul 09 06:08:42 2018 +0000

description:
fix false positive KASSERT.
the case that secondary processors failed to hatch, and not attached.

when "cpu1 at cpus0: disabled (unresponsive)"

diffstat:

 sys/arch/arm/pic/pic.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ae93552c886d -r c346fbd97a8f sys/arch/arm/pic/pic.c
--- a/sys/arch/arm/pic/pic.c    Mon Jul 09 06:07:06 2018 +0000
+++ b/sys/arch/arm/pic/pic.c    Mon Jul 09 06:08:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic.c,v 1.42 2018/04/01 04:35:04 ryo Exp $     */
+/*     $NetBSD: pic.c,v 1.43 2018/07/09 06:08:42 ryo Exp $     */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.42 2018/04/01 04:35:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.43 2018/07/09 06:08:42 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -201,7 +201,7 @@
                        sent_p = true;
                }
        }
-       KASSERT(cold || sent_p || arm_cpu_max == 1);
+       KASSERT(cold || sent_p || ncpu <= 1);
 }
 #endif /* MULTIPROCESSOR */
 



Home | Main Index | Thread Index | Old Index