diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /arch/i386/kernel/io_apic.c | |
| parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
| parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index f2dd218d88cb..235822b3f41b 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
| @@ -2566,8 +2566,10 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2566 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2566 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 2567 | 2567 | ||
| 2568 | /* Sanity check */ | 2568 | /* Sanity check */ |
| 2569 | if (reg_00.bits.ID != apic_id) | 2569 | if (reg_00.bits.ID != apic_id) { |
| 2570 | panic("IOAPIC[%d]: Unable change apic_id!\n", ioapic); | 2570 | printk("IOAPIC[%d]: Unable to change apic_id!\n", ioapic); |
| 2571 | return -1; | ||
| 2572 | } | ||
| 2571 | } | 2573 | } |
| 2572 | 2574 | ||
| 2573 | apic_printk(APIC_VERBOSE, KERN_INFO | 2575 | apic_printk(APIC_VERBOSE, KERN_INFO |