Commit ce6444d3 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Thomas Gleixner
Browse files

x86: mp_bus_id_to_pci_bus is not needed

parent bab4b27c

arch/x86/kernel/io_apic_32.c

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) 


	apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, "

		"slot:%d, pin:%d.\n", bus, slot, pin);

	if (mp_bus_id_to_pci_bus[bus] == -1) {

	if (test_bit(bus, mp_bus_not_pci)) {

		printk(KERN_WARNING "PCI BIOS passed nonexistent PCI bus %d!\n", bus);

		return -1;

	}

arch/x86/kernel/io_apic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) 


	apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",

		bus, slot, pin);

	if (mp_bus_id_to_pci_bus[bus] == -1) {

	if (test_bit(bus, mp_bus_not_pci)) {

		apic_printk(APIC_VERBOSE, "PCI BIOS passed nonexistent PCI bus %d!\n", bus);

		return -1;

	}

arch/x86/kernel/mpparse.c

+0 −10
Original line number Diff line number Diff line
@@ -41,13 +41,6 @@ int mp_bus_id_to_type[MAX_MP_BUSSES]; 
#endif



DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);

int mp_bus_id_to_pci_bus[MAX_MP_BUSSES] = {[0 ... MAX_MP_BUSSES - 1] = -1 };



static int mp_current_pci_id;



/*

 * Intel MP BIOS table parsing routines:

 */



/*

 * Checksum an MP configuration block.
@@ -101,7 +94,6 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m) 
static void __init MP_bus_info(struct mpc_config_bus *m)

{

	char str[7];



	memcpy(str, m->mpc_bustype, 6);

	str[6] = 0;
@@ -130,8 +122,6 @@ static void __init MP_bus_info(struct mpc_config_bus *m) 
		mpc_oem_pci_bus(m, translation_table[mpc_record]);

#endif

		clear_bit(m->mpc_busid, mp_bus_not_pci);

		mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id;

		mp_current_pci_id++;

#if defined(CONFIG_EISA) || defined (CONFIG_MCA)

		mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI;

	} else if (strncmp(str, BUSTYPE_EISA, sizeof(BUSTYPE_EISA) - 1) == 0) {

include/asm-x86/mpspec.h

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ extern int mp_bus_id_to_type[MAX_MP_BUSSES]; 


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;

extern int smp_found_config;

extern int mpc_default_type;