Index: arch/ia32/include/i8042.h
===================================================================
--- arch/ia32/include/i8042.h	(revision 973be64e8e922f2fbbbb92f7f7cddc8125f9e36b)
+++ arch/ia32/include/i8042.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -40,5 +40,4 @@
 
 extern void i8042_init(void);
-extern void i8042_interrupt(__u8 n, __native stack[]);
 
 #endif
Index: arch/ia32/include/i8254.h
===================================================================
--- arch/ia32/include/i8254.h	(revision 973be64e8e922f2fbbbb92f7f7cddc8125f9e36b)
+++ arch/ia32/include/i8254.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -33,5 +33,4 @@
 
 extern void i8254_init(void);
-extern void i8254_interrupt(__u8 n, __native stack[]);
 extern void i8254_calibrate_delay_loop(void);
 extern void i8254_normal_operation(void);
Index: arch/ia32/include/i8259.h
===================================================================
--- arch/ia32/include/i8259.h	(revision 973be64e8e922f2fbbbb92f7f7cddc8125f9e36b)
+++ arch/ia32/include/i8259.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -45,5 +45,4 @@
 extern void pic_disable_irqs(__u16 irqmask);
 extern void pic_eoi(void);
-extern void pic_spurious(__u8 n, __native stack[]);
 
 #endif
Index: arch/ia32/include/interrupt.h
===================================================================
--- arch/ia32/include/interrupt.h	(revision 973be64e8e922f2fbbbb92f7f7cddc8125f9e36b)
+++ arch/ia32/include/interrupt.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -27,6 +27,6 @@
  */
 
-#ifndef __INTERRUPT_H__
-#define __INTERRUPT_H__
+#ifndef __ia32_INTERRUPT_H__
+#define __ia32_INTERRUPT_H__
 
 #include <arch/types.h>
@@ -62,22 +62,16 @@
 #define VECTOR_WAKEUP_IPI		(IVT_FREEBASE+2)
 
-typedef void (* iroutine)(__u8 n, __native stack[]);
-
 extern void (* disable_irqs_function)(__u16 irqmask);
 extern void (* enable_irqs_function)(__u16 irqmask);
 extern void (* eoi_function)(void);
 
-extern iroutine trap_register(__u8 n, iroutine f);
-
-extern void trap_dispatcher(__u8 n, __native stack[]);
-
-extern void null_interrupt(__u8 n, __native stack[]);
-extern void gp_fault(__u8 n, __native stack[]);
-extern void nm_fault(__u8 n, __native stack[]);
-extern void ss_fault(__u8 n, __native stack[]);
-extern void page_fault(__u8 n, __native stack[]);
-extern void syscall(__u8 n, __native stack[]);
-extern void tlb_shootdown_ipi(__u8 n, __native stack[]);
-extern void wakeup_ipi(__u8 n, __native stack[]);
+extern void null_interrupt(int n, void *stack);
+extern void gp_fault(int n, void *stack);
+extern void nm_fault(int n, void *stack);
+extern void ss_fault(int n, void *stack);
+extern void page_fault(int n, void *stack);
+extern void syscall(int n, void *stack);
+extern void tlb_shootdown_ipi(int n, void *stack);
+extern void wakeup_ipi(int n, void *stack);
 
 extern void trap_virtual_enable_irqs(__u16 irqmask);
Index: arch/ia32/include/smp/apic.h
===================================================================
--- arch/ia32/include/smp/apic.h	(revision 973be64e8e922f2fbbbb92f7f7cddc8125f9e36b)
+++ arch/ia32/include/smp/apic.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -312,5 +312,4 @@
 
 extern void apic_init(void);
-extern void apic_spurious(__u8 n, __native stack[]);
 
 extern void l_apic_init(void);
@@ -319,5 +318,4 @@
 extern int l_apic_send_init_ipi(__u8 apicid);
 extern void l_apic_debug(void);
-extern void l_apic_timer_interrupt(__u8 n, __native stack[]);
 extern __u8 l_apic_id(void);