summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2017-07-30 16:08:10 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2017-07-30 16:08:10 +0000
commit187dc3a616f8da7622c030e4ea901f736d0f36dd (patch)
tree05b9f89d9d32bab3b718ae52519493b030e7417d
parent67b74e31ca6353bcf28b954cbc86dc2c37c8c8d1 (diff)
Bump MAXCPUS on octeon.
-rw-r--r--sys/arch/octeon/include/cpu.h4
-rw-r--r--sys/arch/octeon/include/octeonvar.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/octeon/include/cpu.h b/sys/arch/octeon/include/cpu.h
index a19c2f76f30..b07539bef81 100644
--- a/sys/arch/octeon/include/cpu.h
+++ b/sys/arch/octeon/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.9 2017/07/30 16:05:24 visa Exp $ */
+/* $OpenBSD: cpu.h,v 1.10 2017/07/30 16:08:09 visa Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -46,7 +46,7 @@
#ifdef _KERNEL
#if defined(MULTIPROCESSOR) && !defined(_LOCORE)
-#define MAXCPUS 4
+#define MAXCPUS 16
struct cpu_info;
struct cpu_info *hw_getcurcpu(void);
void hw_setcurcpu(struct cpu_info *);
diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h
index 1b5e5e6db43..3811ad68bb7 100644
--- a/sys/arch/octeon/include/octeonvar.h
+++ b/sys/arch/octeon/include/octeonvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: octeonvar.h,v 1.35 2017/07/29 02:50:17 visa Exp $ */
+/* $OpenBSD: octeonvar.h,v 1.36 2017/07/30 16:08:09 visa Exp $ */
/* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */
/*-
@@ -189,8 +189,7 @@ struct octeon_fau_map {
#if defined(_KERNEL) || defined(_STANDALONE)
#define OCTEON_ARGV_MAX 64
-/* Maximum number of cores on <= CN52XX */
-#define OCTEON_MAXCPUS 4
+#define OCTEON_MAXCPUS 16
struct boot_desc {
uint32_t desc_ver;