diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/mpbios.c | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/acpimadt.c | 6 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivar.h | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/mpbios.c b/sys/arch/amd64/amd64/mpbios.c index c94c6b11741..bdc25a501d1 100644 --- a/sys/arch/amd64/amd64/mpbios.c +++ b/sys/arch/amd64/amd64/mpbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbios.c,v 1.12 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: mpbios.c,v 1.13 2008/09/15 19:24:47 kettenis Exp $ */ /* $NetBSD: mpbios.c,v 1.7 2003/05/15 16:32:50 fvdl Exp $ */ /*- @@ -675,7 +675,9 @@ mpbios_cpu(const u_int8_t *ent, struct device *self) caa.caa_name = "cpu"; caa.cpu_number = entry->apic_id; +#ifdef MULTIPROCESSOR caa.cpu_func = &mp_cpu_funcs; +#endif config_found_sm(self, &caa, mp_print, mp_match); } diff --git a/sys/dev/acpi/acpimadt.c b/sys/dev/acpi/acpimadt.c index a0454056e7e..ca64cdea1d2 100644 --- a/sys/dev/acpi/acpimadt.c +++ b/sys/dev/acpi/acpimadt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpimadt.c,v 1.20 2008/08/10 09:59:55 kettenis Exp $ */ +/* $OpenBSD: acpimadt.c,v 1.21 2008/09/15 19:25:36 kettenis Exp $ */ /* * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org> * @@ -33,6 +33,8 @@ #include <machine/i8259.h> #include <machine/i82093reg.h> #include <machine/i82093var.h> +#include <machine/i82489reg.h> +#include <machine/i82489var.h> #include <machine/mpbiosvar.h> @@ -175,7 +177,9 @@ acpimadt_attach(struct device *parent, struct device *self, void *aux) caa.cpu_role = CPU_ROLE_AP; caa.caa_name = "cpu"; caa.cpu_number = entry->madt_lapic.apic_id; +#ifdef MULTIPROCESSOR caa.cpu_func = &mp_cpu_funcs; +#endif #ifdef __i386__ /* * XXX utterly wrong. These are the diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h index a5a7eb65c26..2f2d5047243 100644 --- a/sys/dev/acpi/acpivar.h +++ b/sys/dev/acpi/acpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivar.h,v 1.42 2007/12/05 19:17:13 deraadt Exp $ */ +/* $OpenBSD: acpivar.h,v 1.43 2008/09/15 19:25:36 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -34,10 +34,8 @@ extern int acpi_debug; extern int acpi_hasprocfvs; -#ifdef MULTIPROCESSOR #define LAPIC_MAP_SIZE 256 extern u_int8_t acpi_lapic_flags[LAPIC_MAP_SIZE]; -#endif struct klist; struct acpiec_softc; |