Module Name: src Committed By: matt Date: Sat Mar 29 14:02:46 UTC 2014
Modified Files: src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c Log Message: adjust arm_cpu_max by 1 to be number of cpus To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c 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/evbarm/bcm53xx/bcm53xx_machdep.c diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.8 --- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.7 Sun Jun 30 22:02:56 2013 +++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Sat Mar 29 14:02:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm53xx_machdep.c,v 1.7 2013/06/30 22:02:56 matt Exp $ */ +/* $NetBSD: bcm53xx_machdep.c,v 1.8 2014/03/29 14:02:46 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #define IDM_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.7 2013/06/30 22:02:56 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.8 2014/03/29 14:02:46 matt Exp $"); #include "opt_evbarm_boardtype.h" #include "opt_broadcom.h" @@ -200,7 +200,7 @@ initarm(void *arg) #ifdef MULTIPROCESSOR uint32_t scu_cfg = bus_space_read_4(bcm53xx_armcore_bst, bcm53xx_armcore_bsh, ARMCORE_SCU_BASE + SCU_CFG); - arm_cpu_max = scu_cfg & SCU_CFG_CPUMAX; + arm_cpu_max = 1 + (scu_cfg & SCU_CFG_CPUMAX); membar_producer(); #endif /*