system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-29 13:15:05 +00:00
Code Issues 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:
Tor Egge 2000-08-10 17:33:24 +00:00
parent 2368b03bf4
commit 4428d39d63
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=64494
7 changed files with 28 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/amd64/amd64/mp_machdep.c
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */

6
sys/amd64/amd64/mptable.c
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */

6
sys/amd64/include/mptable.h
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */

6
sys/i386/i386/mp_machdep.c
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */

6
sys/i386/i386/mptable.c
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */

6
sys/i386/include/mptable.h
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */

6
sys/kern/subr_smp.c
View file

@ -1155,11 +1155,9 @@ 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 (num_pci_bus == 1 &&
bus_data[bus_pci].bus_id != 0) {
/* mis-numbered, swap with whichever bus uses slot 0 */