diff options
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/kernel/setup.c | 4 | ||||
-rw-r--r-- | arch/m68knommu/platform/5307/ints.c | 1 | ||||
-rw-r--r-- | arch/m68knommu/platform/68328/ints.c | 5 | ||||
-rw-r--r-- | arch/m68knommu/platform/68328/timers.c | 3 | ||||
-rw-r--r-- | arch/m68knommu/platform/68360/config.c | 3 | ||||
-rw-r--r-- | arch/m68knommu/platform/68EZ328/config.c | 3 | ||||
-rw-r--r-- | arch/m68knommu/platform/68VZ328/config.c | 3 |
7 files changed, 13 insertions, 9 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index d5c25d27b64..8133b104735 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c @@ -51,7 +51,7 @@ static void dummy_waitbut(void) { } -void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *)); +void (*mach_sched_init) (irq_handler_t handler); void (*mach_tick)( void ); /* machine dependent keyboard functions */ int (*mach_keyb_init) (void); @@ -66,7 +66,7 @@ void (*mach_trap_init) (void); /* machine dependent timer functions */ unsigned long (*mach_gettimeoffset) (void); void (*mach_gettod) (int*, int*, int*, int*, int*, int*); -int (*mach_hwclk) (int, struct hwclk_time*); +int (*mach_hwclk) (int, struct rtc_time*); int (*mach_set_clock_mmss) (unsigned long); void (*mach_mksound)( unsigned int count, unsigned int ticks ); void (*mach_reset)( void ); diff --git a/arch/m68knommu/platform/5307/ints.c b/arch/m68knommu/platform/5307/ints.c index 20f12a19a52..751633038c4 100644 --- a/arch/m68knommu/platform/5307/ints.c +++ b/arch/m68knommu/platform/5307/ints.c @@ -42,7 +42,6 @@ static irq_node_t nodes[NUM_IRQ_NODES]; /* The number of spurious interrupts */ volatile unsigned int num_spurious; -unsigned int local_bh_count[NR_CPUS]; unsigned int local_irq_count[NR_CPUS]; static irqreturn_t default_irq_handler(int irq, void *ptr) diff --git a/arch/m68knommu/platform/68328/ints.c b/arch/m68knommu/platform/68328/ints.c index 2dda7339aae..3de6e337554 100644 --- a/arch/m68knommu/platform/68328/ints.c +++ b/arch/m68knommu/platform/68328/ints.c @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/errno.h> +#include <linux/interrupt.h> #include <asm/system.h> #include <asm/irq.h> @@ -64,7 +65,7 @@ asmlinkage void trap44(void); asmlinkage void trap45(void); asmlinkage void trap46(void); asmlinkage void trap47(void); -asmlinkage irqreturn_t bad_interrupt(int, void *, struct pt_regs *); +asmlinkage irqreturn_t bad_interrupt(int, void *); asmlinkage irqreturn_t inthandler(void); asmlinkage irqreturn_t inthandler1(void); asmlinkage irqreturn_t inthandler2(void); @@ -121,7 +122,7 @@ void init_IRQ(void) int request_irq( unsigned int irq, - irqreturn_t (*handler)(int, void *, struct pt_regs *), + irq_handler_t handler, unsigned long flags, const char *devname, void *dev_id) diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c index 438ef6ee972..ef067f4c3cd 100644 --- a/arch/m68knommu/platform/68328/timers.c +++ b/arch/m68knommu/platform/68328/timers.c @@ -17,6 +17,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> #include <asm/pgtable.h> @@ -52,7 +53,7 @@ /***************************************************************************/ -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)) +void m68328_timer_init(irq_handler_t timer_routine) { /* disable timer 1 */ TCTL = 0; diff --git a/arch/m68knommu/platform/68360/config.c b/arch/m68knommu/platform/68360/config.c index 1b36f626176..4ff13bd51ff 100644 --- a/arch/m68knommu/platform/68360/config.c +++ b/arch/m68knommu/platform/68360/config.c @@ -16,6 +16,7 @@ #include <linux/mm.h> #include <linux/tty.h> #include <linux/console.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> @@ -50,7 +51,7 @@ extern unsigned long int system_clock; //In kernel setup.c extern void config_M68360_irq(void); -void BSP_sched_init(void (*timer_routine)(int, void *, struct pt_regs *)) +void BSP_sched_init(irq_handler_t timer_routine) { unsigned char prescaler; unsigned short tgcr_save; diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c index 659b80aca11..ab36551fc96 100644 --- a/arch/m68knommu/platform/68EZ328/config.c +++ b/arch/m68knommu/platform/68EZ328/config.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/tty.h> #include <linux/console.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> @@ -31,7 +32,7 @@ /***************************************************************************/ -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)); +void m68328_timer_init(irq_handler_t timer_routine); void m68328_timer_tick(void); unsigned long m68328_timer_gettimeoffset(void); void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec); diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c index fcd100b7594..8abe0f6e723 100644 --- a/arch/m68knommu/platform/68VZ328/config.c +++ b/arch/m68knommu/platform/68VZ328/config.c @@ -21,6 +21,7 @@ #include <linux/console.h> #include <linux/kd.h> #include <linux/netdevice.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/system.h> @@ -36,7 +37,7 @@ /***************************************************************************/ -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *)); +void m68328_timer_init(irq_handler_t timer_routine); void m68328_timer_tick(void); unsigned long m68328_timer_gettimeoffset(void); void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec); |