summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-03-31 09:44:22 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-03-31 09:44:22 +0000
commite1d98b9dea7e9dbad2879e4f47c3946bc455c798 (patch)
tree50d0736ee2d3171896ebb232ceae4a6f920422b4 /sys
parentd04a5f72f15f74532321ab17bc6570517f41171b (diff)
Make sure we not to match secondary cpu's on non-MP kernel. I accidentally
didn't commit this bit, so it is still ok drahn@, gwk@.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/macppc/cpu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c
index 7654f6aa20f..c338dfee313 100644
--- a/sys/arch/macppc/macppc/cpu.c
+++ b/sys/arch/macppc/macppc/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.39 2007/03/20 20:59:54 kettenis Exp $ */
+/* $OpenBSD: cpu.c,v 1.40 2007/03/31 09:44:21 kettenis Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -101,11 +101,15 @@ int
cpumatch(struct device *parent, void *cfdata, void *aux)
{
struct confargs *ca = aux;
+ int *reg = ca->ca_reg;
/* make sure that we're looking for a CPU. */
if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
return (0);
+ if (reg[0] >= PPC_MAXPROCS)
+ return (0);
+
return (1);
}