Bladeren bron

x86: make io_apic not connected pin print complete

Normally we will have two segment not connected pin pin0, and pin after
15...

So we need to print out "not connected\n" for previous segment, before
printing out connected pins info...

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Yinghai Lu 17 jaren geleden
bovenliggende
commit
20d225b991
2 gewijzigde bestanden met toevoegingen van 10 en 1 verwijderingen
  1. 5 0
      arch/x86/kernel/io_apic_32.c
  2. 5 1
      arch/x86/kernel/io_apic_64.c

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

@@ -1296,6 +1296,11 @@ static void __init setup_IO_APIC_irqs(void)
 			continue;
 			continue;
 		}
 		}
 
 
+		if (!first_notcon) {
+			apic_printk(APIC_VERBOSE, " not connected.\n");
+			first_notcon = 1;
+		}
+
 		entry.trigger = irq_trigger(idx);
 		entry.trigger = irq_trigger(idx);
 		entry.polarity = irq_polarity(idx);
 		entry.polarity = irq_polarity(idx);
 
 

+ 5 - 1
arch/x86/kernel/io_apic_64.c

@@ -875,6 +875,10 @@ static void __init setup_IO_APIC_irqs(void)
 				apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mpc_apicid, pin);
 				apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mpc_apicid, pin);
 			continue;
 			continue;
 		}
 		}
+		if (!first_notcon) {
+			apic_printk(APIC_VERBOSE, " not connected.\n");
+			first_notcon = 1;
+		}
 
 
 		irq = pin_2_irq(idx, apic, pin);
 		irq = pin_2_irq(idx, apic, pin);
 		add_pin_to_irq(irq, apic, pin);
 		add_pin_to_irq(irq, apic, pin);
@@ -885,7 +889,7 @@ static void __init setup_IO_APIC_irqs(void)
 	}
 	}
 
 
 	if (!first_notcon)
 	if (!first_notcon)
-		apic_printk(APIC_VERBOSE," not connected.\n");
+		apic_printk(APIC_VERBOSE, " not connected.\n");
 }
 }
 
 
 /*
 /*