Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/arm Define NCPUINFO and set it to 1 or MAXCPUS ...



details:   https://anonhg.NetBSD.org/src/rev/0e6d7307ec15
branches:  trunk
changeset: 822741:0e6d7307ec15
user:      sevan <sevan%NetBSD.org@localhost>
date:      Tue Apr 04 11:46:12 2017 +0000

description:
Define NCPUINFO and set it to 1 or MAXCPUS whether on single or multiprocessor system.
Use NCPUINFO as the array size for *cpu_info[].
Closes PR port-hpcarm/52138
Patch by skrll
ok pgoyette

diffstat:

 sys/arch/arm/arm/arm_machdep.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r d715bdc7f05e -r 0e6d7307ec15 sys/arch/arm/arm/arm_machdep.c
--- a/sys/arch/arm/arm/arm_machdep.c    Tue Apr 04 10:25:38 2017 +0000
+++ b/sys/arch/arm/arm/arm_machdep.c    Tue Apr 04 11:46:12 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm_machdep.c,v 1.50 2017/03/16 16:13:20 chs Exp $     */
+/*     $NetBSD: arm_machdep.c,v 1.51 2017/04/04 11:46:12 sevan Exp $   */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.50 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.51 2017/04/04 11:46:12 sevan Exp $");
 
 #include <sys/exec.h>
 #include <sys/proc.h>
@@ -121,10 +121,14 @@
 };
 
 #ifdef MULTIPROCESSOR
-struct cpu_info *cpu_info[MAXCPUS] = {
+#define        NCPUINFO        MAXCPUS
+#else
+#define        NCPUINFO        1
+#endif
+
+struct cpu_info *cpu_info[NCPUINFO] = {
        [0] = &cpu_info_store
 };
-#endif
 
 const pcu_ops_t * const pcu_ops_md_defs[PCU_UNIT_COUNT] = {
 #if defined(FPU_VFP)



Home | Main Index | Thread Index | Old Index