[PATCH] powerpc: unified signature of timer_interrupt() between ppc32/ppc64
On ppc64 timer_interrupt() returned a value that was never used. Changed the ppc64 version of timer_interrupt() to no longer return a value so that the signatures between ppc32 & ppc64 match. This will simplify future merging of arch/powerpc. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
82cd02c16b
commit
c7aeffc4d3
|
@ -319,7 +319,7 @@ unsigned long tb_last_stamp __cacheline_aligned_in_smp;
|
|||
* timer_interrupt - gets called when the decrementer overflows,
|
||||
* with interrupts disabled.
|
||||
*/
|
||||
int timer_interrupt(struct pt_regs * regs)
|
||||
void timer_interrupt(struct pt_regs * regs)
|
||||
{
|
||||
int next_dec;
|
||||
unsigned long cur_tb;
|
||||
|
@ -377,8 +377,6 @@ int timer_interrupt(struct pt_regs * regs)
|
|||
}
|
||||
|
||||
irq_exit();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include <linux/errno.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
int timer_interrupt(struct pt_regs *);
|
||||
extern void timer_interrupt(struct pt_regs *);
|
||||
extern void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq);
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
|
|
Loading…
Reference in New Issue