diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-12-22 18:53:15 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-12-22 18:53:15 +0000 |
| commit | 70742e3728caaf06f1c561dadebf02395af8008d (patch) | |
| tree | 2b963770b05653a79772c9e1e5d62384a62160a6 /sys | |
| parent | 465fb6f7d6a48fc8784f4e5e80ca372b903a30d1 (diff) | |
Only attach cpu0 on single-processor kernels, to match the expected behaviour.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/alpha/cpu.c | 9 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c index 5c0f7dddccd..47ca2118cd5 100644 --- a/sys/arch/alpha/alpha/cpu.c +++ b/sys/arch/alpha/alpha/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.29 2012/07/09 09:07:25 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.30 2013/12/22 18:53:14 miod Exp $ */ /* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */ /*- @@ -205,8 +205,11 @@ cpumatch(parent, cfdata, aux) if (strcmp(ma->ma_name, cpu_cd.cd_name) != 0) return (0); - /* XXX CHECK SLOT? */ - /* XXX CHECK PRIMARY? */ +#ifndef MULTIPROCESSOR + /* Only attach the boot processor. */ + if (ma->ma_slot != hwrpb->rpb_primary_cpu_id) + return (0); +#endif return (1); } diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index e241c9313dd..012034b4019 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.235 2013/11/15 19:42:19 sasano Exp $ +# $OpenBSD: GENERIC,v 1.236 2013/12/22 18:53:14 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -48,7 +48,7 @@ option USER_PCICONF # user-space PCI configuration config bsd swap generic mainbus0 at root -cpu* at mainbus0 +cpu0 at mainbus0 # PCI USB Controllers ehci* at pci? # Enhanced Host Controller |