merge

diff --cc arch/i386/kernel/io_apic.c
index 11fe9e8812541d8b80522e679a9e5c90a2047247,e3e57d4ca25fa73e727c6dc2297b09b8aadf689e..771a35d97c25dd60367514691b81b7ee7ad97cb8
--- 1/arch/i386/kernel/io_apic.c
--- 2/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@@ -42,7 -42,7 +42,8 @@@
  
  #include "io_ports.h"
  
+ int (*ioapic_renumber_irq)(int ioapic, int irq);
 +atomic_t irq_mis_count;
  
  static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED;
  

diff --cc arch/i386/kernel/mpparse.c
Simple merge

diff --cc include/asm-i386/io_apic.h
Simple merge