diff options
| author | Tor Egge <tegge@FreeBSD.org> | 2000-08-10 17:33:24 +0000 |
|---|---|---|
| committer | Tor Egge <tegge@FreeBSD.org> | 2000-08-10 17:33:24 +0000 |
| commit | 4428d39d633e9cceeacc0395cd356fa19fe1d09d (patch) | |
| tree | 9a41cbe2866cb58eb7897e83047b4211e35bc60d | |
| parent | 2368b03bf4d5543302827646a31fd267f3a40a48 (diff) | |
Notes
| -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, 28 insertions, 42 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index f8e77a19cf17..50d1ce7643d5 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ |