Skip to content

Commit

Permalink
[PATCH] powerpc: unified signature of timer_interrupt() between ppc32…
Browse files Browse the repository at this point in the history
…/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>
  • Loading branch information
Kumar Gala authored and Paul Mackerras committed Sep 21, 2005
1 parent 82cd02c commit c7aeffc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions arch/ppc64/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -377,8 +377,6 @@ int timer_interrupt(struct pt_regs * regs)
}

irq_exit();

return 1;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion include/asm-ppc64/hw_irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c7aeffc

Please sign in to comment.