x86: use not_pci bitmap #6 (643befed) · Commits · 戴 / test

arch/x86/kernel/io_apic_32.c

+15 −32

Original line number	Diff line number	Diff line
		@@ -1091,17 +1091,9 @@ static int pin_2_irq(int idx, int apic, int pin)
		if (mp_irqs[idx].mpc_dstirq != pin)
		printk(KERN_ERR "broken BIOS or MPTABLE parser, ayiee!!\n");

		switch (mp_bus_id_to_type[bus])
		{
		case MP_BUS_ISA: /* ISA pin */
		case MP_BUS_EISA:
		case MP_BUS_MCA:
		{
		if (test_bit(bus, mp_bus_not_pci))
		irq = mp_irqs[idx].mpc_srcbusirq;
		break;
		}
		case MP_BUS_PCI: /* PCI pin */
		{
		else {
		/*
		* PCI IRQs are mapped in order
		*/
		@@ -1115,15 +1107,6 @@ static int pin_2_irq(int idx, int apic, int pin)
		*/
		if (ioapic_renumber_irq)
		irq = ioapic_renumber_irq(apic, irq);

		break;
		}
		default:
		{
		printk(KERN_ERR "unknown bus type %d.\n",bus);
		irq = 0;
		break;
		}
		}

		/*