diff options
author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2007-10-17 12:04:41 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:16:57 -0400 |
commit | 20d225b991c88d9f46f6169be3cfc113ea2bf82d (patch) | |
tree | 34d3d45c5a7eb0aad434af3120d764b62f8dec6d /arch/x86 | |
parent | 382f64ab8f178fe6ca5e7beafa7f03132724bbfb (diff) |
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>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 5 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 4ee1e5ee9b57..5f10c7189534 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -1296,6 +1296,11 @@ static void __init setup_IO_APIC_irqs(void) | |||
1296 | continue; | 1296 | continue; |
1297 | } | 1297 | } |
1298 | 1298 | ||
1299 | if (!first_notcon) { | ||
1300 | apic_printk(APIC_VERBOSE, " not connected.\n"); | ||
1301 | first_notcon = 1; | ||
1302 | } | ||
1303 | |||
1299 | entry.trigger = irq_trigger(idx); | 1304 | entry.trigger = irq_trigger(idx); |
1300 | entry.polarity = irq_polarity(idx); | 1305 | entry.polarity = irq_polarity(idx); |
1301 | 1306 | ||
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 66a27d268d9a..1c2c7bf6a9d3 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -875,6 +875,10 @@ static void __init setup_IO_APIC_irqs(void) | |||
875 | apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mpc_apicid, pin); | 875 | apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mpc_apicid, pin); |
876 | continue; | 876 | continue; |
877 | } | 877 | } |
878 | if (!first_notcon) { | ||
879 | apic_printk(APIC_VERBOSE, " not connected.\n"); | ||
880 | first_notcon = 1; | ||
881 | } | ||
878 | 882 | ||
879 | irq = pin_2_irq(idx, apic, pin); | 883 | irq = pin_2_irq(idx, apic, pin); |
880 | add_pin_to_irq(irq, apic, pin); | 884 | add_pin_to_irq(irq, apic, pin); |
@@ -885,7 +889,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
885 | } | 889 | } |
886 | 890 | ||
887 | if (!first_notcon) | 891 | if (!first_notcon) |
888 | apic_printk(APIC_VERBOSE," not connected.\n"); | 892 | apic_printk(APIC_VERBOSE, " not connected.\n"); |
889 | } | 893 | } |
890 | 894 | ||
891 | /* | 895 | /* |