diff options
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 10 | ||||
| -rw-r--r-- | sys/amd64/amd64/mptable.c | 10 | ||||
| -rw-r--r-- | sys/amd64/include/mptable.h | 10 | ||||
| -rw-r--r-- | sys/i386/i386/mp_machdep.c | 10 | ||||
| -rw-r--r-- | sys/i386/i386/mptable.c | 10 | ||||
| -rw-r--r-- | sys/i386/include/mptable.h | 10 | ||||
| -rw-r--r-- | sys/kern/subr_smp.c | 10 |
7 files changed, 49 insertions, 21 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 8f26040..55bc8d2 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.7 1997/05/03 17:42:01 fsmp Exp $ + * $Id: mp_machdep.c,v 1.8 1997/05/05 22:56:27 fsmp Exp $ */ #include "opt_smp.h" @@ -898,10 +898,14 @@ get_isa_apic_mask(u_int isaMASK) if (isairq == 0) { return 0; } + --isairq; - apicpin = get_isa_apic_irq(isairq - 1); + apicpin = get_isa_apic_irq( isairq ); if (apicpin == -1) { - return 0; + apicpin = get_eisa_apic_irq( isairq ); + if (apicpin == -1) { + return 0; + } } return (1 << apicpin); |
