oprofile: fix oops on x86 32-bit

[pandora-kernel.git] / include / asm-m68k / irq.h

diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index f4ae7d8..eb29a52 100644 (file)
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -59,16 +59,13 @@
 #define IRQ_USER       8
 
 extern unsigned int irq_canonicalize(unsigned int irq);
-extern void enable_irq(unsigned int);
-extern void disable_irq(unsigned int);
-#define disable_irq_nosync     disable_irq
 
 struct pt_regs;
 
 /*
  * various flags for request_irq() - the Amiga now uses the standard
- * mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ
- * are your friends.
+ * mechanism like all other architectures - IRQF_DISABLED and
+ * IRQF_SHARED are your friends.
  */
 #ifndef MACH_AMIGA_ONLY
 #define IRQ_FLG_LOCK   (0x0001)        /* handler is not replaceable   */
@@ -83,7 +80,7 @@ struct pt_regs;
  * interrupt source (if it supports chaining).
  */
 typedef struct irq_node {
-       int             (*handler)(int, void *, struct pt_regs *);
+       int             (*handler)(int, void *);
        void            *dev_id;
        struct irq_node *next;
        unsigned long   flags;
@@ -93,12 +90,12 @@ typedef struct irq_node {
 /*
  * This structure has only 4 elements for speed reasons
  */
-typedef struct irq_handler {
-       int             (*handler)(int, void *, struct pt_regs *);
+struct irq_handler {
+       int             (*handler)(int, void *);
        unsigned long   flags;
        void            *dev_id;
        const char      *devname;
-} irq_handler_t;
+};
 
 struct irq_controller {
        const char *name;
@@ -122,6 +119,7 @@ extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
                                      void (*handler)(unsigned int, struct pt_regs *));
 extern void m68k_setup_irq_controller(struct irq_controller *, unsigned int, unsigned int);
 
-asmlinkage void m68k_handle_int(unsigned int, struct pt_regs *);
+asmlinkage void m68k_handle_int(unsigned int);
+asmlinkage void __m68k_handle_int(unsigned int, struct pt_regs *);
 
 #endif /* _M68K_IRQ_H_ */