d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't skip IOAPIC id conflict detection when only one pci bus is present.

Browse Source 
PR:		20312
Reviewed by:	Steve Roome <steve@sse0691.bri.hp.com>
This commit is contained in:
tegge 2000-08-10 17:33:24 +00:00
parent 236344f734
commit 17a384d63d
7 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amd64/amd64/mp_machdep.c
View File

@ -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 */

10
sys/amd64/amd64/mptable.c
View File

@ -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 */

10
sys/amd64/include/mptable.h
View File

@ -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 */

10
sys/i386/i386/mp_machdep.c
View File

@ -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 */

10
sys/i386/i386/mptable.c
View File

@ -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 */

10
sys/i386/include/mptable.h
View File

@ -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 */

10
sys/kern/subr_smp.c
View File

@ -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 */