summaryrefslogtreecommitdiff
path: root/sys/arch/luna88k
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-04-19 17:56:14 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-04-19 17:56:14 +0000
commit74ee683870532751e5b076004e960d3bdf0610e0 (patch)
tree26445594c096ae25cf41889597e055268ea2b25f /sys/arch/luna88k
parent8ed5d59c554077f36ecf88a31ba5169f6777c709 (diff)
Rename max_cpus to ncpusfound and compute it regardless of option
MULTIPROCESSOR.
Diffstat (limited to 'sys/arch/luna88k')
-rw-r--r--sys/arch/luna88k/luna88k/m8820x.c8
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/luna88k/luna88k/m8820x.c b/sys/arch/luna88k/luna88k/m8820x.c
index 5b9273a9c50..831de4a4692 100644
--- a/sys/arch/luna88k/luna88k/m8820x.c
+++ b/sys/arch/luna88k/luna88k/m8820x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m8820x.c,v 1.14 2007/11/14 23:12:45 miod Exp $ */
+/* $OpenBSD: m8820x.c,v 1.15 2009/04/19 17:56:13 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -126,14 +126,14 @@ m8820x_setup_board_config()
break;
}
- max_cpus = num >> 1;
- max_cmmus = max_cpus << 1;
+ ncpusfound = num >> 1;
+ max_cmmus = ncpusfound << 1;
cmmu_shift = 1; /* fixed 2:1 configuration */
/*
* Now that we know which CMMUs are there, report every association
*/
- for (num = 0; num < max_cpus; num++) {
+ for (num = 0; num < ncpusfound; num++) {
volatile unsigned *cr;
int type;
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 3230fa4d618..79be85bbecc 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.61 2009/02/16 22:55:03 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.62 2009/04/19 17:56:13 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -1062,7 +1062,7 @@ luna88k_bootstrap()
* currently-running CPU; initialize the others with similar settings
* as well, after calling pmap_bootstrap() above.
*/
- for (cpu = 0; cpu < max_cpus; cpu++) {
+ for (cpu = 0; cpu < ncpusfound; cpu++) {
if (cpu == master_cpu)
continue;
m8820x_initialize_cpu(cpu);