x86: add mp_bus_not_pci bitmap to mpparse_32.c (a6333c3c) · Commits · 戴 / test

arch/x86/kernel/mpparse_32.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ unsigned int __cpuinitdata maxcpus = NR_CPUS;
		*/
		int apic_version [MAX_APICS];
		int mp_bus_id_to_type [MAX_MP_BUSSES];
		DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
		int mp_bus_id_to_node [MAX_MP_BUSSES];
		int mp_bus_id_to_local [MAX_MP_BUSSES];
		int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
		@@ -240,12 +241,14 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
		}
		#endif

		set_bit(m->mpc_busid, mp_bus_not_pci);
		if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) {
		mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA;
		} else if (strncmp(str, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) {
		mp_bus_id_to_type[m->mpc_busid] = MP_BUS_EISA;
		} else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) {
		mpc_oem_pci_bus(m, translation_table[mpc_record]);
		clear_bit(m->mpc_busid, mp_bus_not_pci);
		mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI;
		mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id;
		mp_current_pci_id++;
		@@ -984,6 +987,7 @@ void __init mp_config_acpi_legacy_irqs (void)
		* Fabricate the legacy ISA bus (bus #31).
		*/
		mp_bus_id_to_type[MP_ISA_BUS] = MP_BUS_ISA;
		set_bit(MP_ISA_BUS, mp_bus_not_pci);
		Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);

		/*

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,13 +23,12 @@ extern int pic_mode;
		/* Each PCI slot may be a combo card with its own bus. 4 IRQ pins per slot. */
		#define MAX_IRQ_SOURCES (MAX_MP_BUSSES * 4)

		extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);

		extern void early_find_smp_config(void);
		extern void early_get_smp_config(void);

		#endif

		extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
		extern int mp_bus_id_to_pci_bus[MAX_MP_BUSSES];

		extern unsigned int boot_cpu_physical_apicid;