Re: [ACPI] [PATCH] 1 of 6 sync mpparse

Bjorn Helgaas
2004-03-09T23:24:50Z

i386, x86_64: sync mpparse.c slightly

This cleans up a little whitespace and a couple typos to remove
needless differences between mpparse.c for i386 and x86_64.

diff -Nru a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
--- a/arch/i386/kernel/mpparse.c Tue Mar 9 13:13:20 2004
+++ b/arch/i386/kernel/mpparse.c Tue Mar 9 13:13:20 2004
@@ -1,5 +1,5 @@
/*
- * Intel Multiprocessor Specificiation 1.1 and 1.4
+ * Intel Multiprocessor Specification 1.1 and 1.4
* compliant MP-table parsing routines.
*
* (c) 1995 Alan Cox, Building #3 <alan@redhat.com>
@@ -1158,19 +1158,19 @@
if ((1<<bit) & mp_ioapic_routing[ioapic].pin_programmed[idx]) {
Dprintk(KERN_DEBUG "Pin %d-%d already programmed\n",
mp_ioapic_routing[ioapic].apic_id, ioapic_pin);
- entry->irq = acpi_irq_to_vector(irq);
+ entry->irq = acpi_irq_to_vector(irq);
continue;
}

mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);

if (!io_apic_set_pci_routing(ioapic, ioapic_pin, irq, edge_level, active_high_low)) {
- entry->irq = acpi_irq_to_vector(irq);
- }
+ entry->irq = acpi_irq_to_vector(irq);
+ }
printk(KERN_DEBUG "%02x:%02x:%02x[%c] -> %d-%d -> IRQ %d\n",
- entry->id.segment, entry->id.bus,
- entry->id.device, ('A' + entry->pin),
- mp_ioapic_routing[ioapic].apic_id, ioapic_pin,
+ entry->id.segment, entry->id.bus,
+ entry->id.device, ('A' + entry->pin),
+ mp_ioapic_routing[ioapic].apic_id, ioapic_pin,
entry->irq);
}

diff -Nru a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
--- a/arch/x86_64/kernel/mpparse.c Tue Mar 9 13:13:20 2004
+++ b/arch/x86_64/kernel/mpparse.c Tue Mar 9 13:13:20 2004
@@ -9,7 +9,7 @@
* Erich Boleyn : MP v1.4 and additional changes.
* Alan Cox : Added EBDA scanning
* Ingo Molnar : various cleanups and rewrites
- * Maciej W. Rozycki : Bits for default MP configurations
+ * Maciej W. Rozycki: Bits for default MP configurations
* Paul Diefenbaugh: Added full ACPI support
*/

@@ -1009,14 +1009,14 @@
if (use_pci_vector() && !platform_legacy_irq(irq))
irq = IO_APIC_VECTOR(irq);
entry->irq = irq;
- }
- printk(KERN_DEBUG "%02x:%02x:%02x[%c] -> %d-%d"
- " -> IRQ %d\n", entry->id.segment, entry->id.bus,
- entry->id.device, ('A' + entry->pin),
+ }
+ printk(KERN_DEBUG "%02x:%02x:%02x[%c] -> %d-%d -> IRQ %d\n",
+ entry->id.segment, entry->id.bus,
+ entry->id.device, ('A' + entry->pin),
mp_ioapic_routing[ioapic].apic_id, ioapic_pin,
entry->irq);
}
-
+
print_IO_APIC();

return;