diff options
| -rw-r--r-- | sys/arch/amd64/amd64/mpbios.c | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/include/mpconfig.h | 3 | ||||
| -rw-r--r-- | sys/dev/acpi/acpimadt.c | 9 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/arch/amd64/amd64/mpbios.c b/sys/arch/amd64/amd64/mpbios.c index 57a3c9e7695..ed31eb7aed3 100644 --- a/sys/arch/amd64/amd64/mpbios.c +++ b/sys/arch/amd64/amd64/mpbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbios.c,v 1.18 2009/04/21 19:18:09 kettenis Exp $ */ +/* $OpenBSD: mpbios.c,v 1.19 2011/03/06 22:40:05 deraadt Exp $ */ /* $NetBSD: mpbios.c,v 1.7 2003/05/15 16:32:50 fvdl Exp $ */ /*- @@ -1022,7 +1022,6 @@ mpbios_int(const u_int8_t *ent, int enttype, struct mp_intr_map *mpi) } mpi->bus = mpb; mpi->bus_pin = dev; - mpi->global_int = -1; mpi->type = type; mpi->flags = flags; diff --git a/sys/arch/amd64/include/mpconfig.h b/sys/arch/amd64/include/mpconfig.h index d42d0b37dca..7b78dfcfdc5 100644 --- a/sys/arch/amd64/include/mpconfig.h +++ b/sys/arch/amd64/include/mpconfig.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpconfig.h,v 1.6 2008/01/15 19:30:32 kettenis Exp $ */ +/* $OpenBSD: mpconfig.h,v 1.7 2011/03/06 22:40:05 deraadt Exp $ */ /* $NetBSD: mpconfig.h,v 1.2 2003/05/11 00:05:52 fvdl Exp $ */ /* @@ -33,7 +33,6 @@ struct mp_intr_map { int flags; /* from mp spec intr record */ u_int32_t redir; int cpu_id; - int global_int; /* ACPI global interrupt number */ }; #if defined(_KERNEL) diff --git a/sys/dev/acpi/acpimadt.c b/sys/dev/acpi/acpimadt.c index 6397c462617..23d8d32c1c5 100644 --- a/sys/dev/acpi/acpimadt.c +++ b/sys/dev/acpi/acpimadt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpimadt.c,v 1.23 2009/04/19 17:53:39 deraadt Exp $ */ +/* $OpenBSD: acpimadt.c,v 1.24 2011/03/06 22:40:05 deraadt Exp $ */ /* * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org> * @@ -316,9 +316,7 @@ acpimadt_attach(struct device *parent, struct device *self, void *aux) map->ioapic_pin = pin - apic->sc_apic_vecbase; map->bus_pin = entry->madt_override.source; map->flags = entry->madt_override.flags; -#ifdef __amd64__ /* XXX */ - map->global_int = entry->madt_override.global_int; -#endif + acpimadt_cfg_intr(entry->madt_override.flags, &map->redir); map->ioapic_ih = APIC_INT_VIA_APIC | @@ -380,9 +378,6 @@ acpimadt_attach(struct device *parent, struct device *self, void *aux) map->ioapic = apic; map->ioapic_pin = pin; map->bus_pin = pin; -#ifdef __amd64__ /* XXX */ - map->global_int = -1; -#endif map->redir = (IOAPIC_REDLO_DEL_LOPRI << IOAPIC_REDLO_DEL_SHIFT); map->ioapic_ih = APIC_INT_VIA_APIC | |