浏览代码

x86: use not_pci bitmap #5

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Alexey Starikovskiy 17 年之前
父节点
当前提交
9c0076cb34
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      arch/x86/kernel/io_apic_32.c

+ 5 - 2
arch/x86/kernel/io_apic_32.c

@@ -1010,11 +1010,14 @@ static int MPBIOS_trigger(int idx)
 	{
 	{
 		case 0: /* conforms, ie. bus-type dependent */
 		case 0: /* conforms, ie. bus-type dependent */
 		{
 		{
+			trigger = test_bit(bus, mp_bus_not_pci)?
+					default_ISA_trigger(idx):
+					default_PCI_trigger(idx);
 			switch (mp_bus_id_to_type[bus])
 			switch (mp_bus_id_to_type[bus])
 			{
 			{
 				case MP_BUS_ISA: /* ISA pin */
 				case MP_BUS_ISA: /* ISA pin */
 				{
 				{
-					trigger = default_ISA_trigger(idx);
+					/* set before the switch */
 					break;
 					break;
 				}
 				}
 				case MP_BUS_EISA: /* EISA pin */
 				case MP_BUS_EISA: /* EISA pin */
@@ -1024,7 +1027,7 @@ static int MPBIOS_trigger(int idx)
 				}
 				}
 				case MP_BUS_PCI: /* PCI pin */
 				case MP_BUS_PCI: /* PCI pin */
 				{
 				{
-					trigger = default_PCI_trigger(idx);
+					/* set before the switch */
 					break;
 					break;
 				}
 				}
 				case MP_BUS_MCA: /* MCA pin */
 				case MP_BUS_MCA: /* MCA pin */