From 79a7a64b85358020c772ecbc6da2dfbc5878ae80 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Fri, 26 Feb 1999 03:42:50 +0000 Subject: Don't call assign_apic_irq with a value for irq that is out of range. --- sys/amd64/amd64/mp_machdep.c | 4 ++-- sys/amd64/amd64/mptable.c | 4 ++-- sys/amd64/include/mptable.h | 4 ++-- sys/i386/i386/mp_machdep.c | 4 ++-- sys/i386/i386/mptable.c | 4 ++-- sys/i386/include/mptable.h | 4 ++-- sys/kern/subr_smp.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 77850521d6403..6f7c88139d41f 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 77850521d6403..6f7c88139d41f 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 77850521d6403..6f7c88139d41f 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 77850521d6403..6f7c88139d41f 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 77850521d6403..6f7c88139d41f 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 77850521d6403..6f7c88139d41f 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 77850521d6403..6f7c88139d41f 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.90 1999/02/19 14:25:32 luoqi Exp $ + * $Id: mp_machdep.c,v 1.91 1999/02/19 19:34:47 luoqi Exp $ */ #include "opt_smp.h" @@ -1090,7 +1090,7 @@ setup_apic_irq_mapping(void) int_to_apicintpin[x].redirindex = 0; } for (x = 0; x < nintrs; x++) { - if (io_apic_ints[x].dst_apic_int <= APIC_INTMAPSIZE && + if (io_apic_ints[x].dst_apic_int < APIC_INTMAPSIZE && io_apic_ints[x].dst_apic_id == IO_TO_ID(0) && io_apic_ints[x].int_vector == 0xff && (io_apic_ints[x].int_type == 0 || -- cgit v1.3