diff options
author | Kumar Gala <galak@freescale.com> | 2005-09-19 10:30:27 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-21 05:21:09 -0400 |
commit | c7aeffc4d38f0573b05bf5ebd2f037997ec9d075 (patch) | |
tree | c70f8882c04e5ffdf041a71751a0703472606bb9 /arch/ppc64/kernel | |
parent | 82cd02c16be99cba6a97d38488aee8807580a202 (diff) |
[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>
Diffstat (limited to 'arch/ppc64/kernel')
-rw-r--r-- | arch/ppc64/kernel/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 9939c206afa4..fb4bf0ad8f32 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c | |||
@@ -319,7 +319,7 @@ unsigned long tb_last_stamp __cacheline_aligned_in_smp; | |||
319 | * timer_interrupt - gets called when the decrementer overflows, | 319 | * timer_interrupt - gets called when the decrementer overflows, |
320 | * with interrupts disabled. | 320 | * with interrupts disabled. |
321 | */ | 321 | */ |
322 | int timer_interrupt(struct pt_regs * regs) | 322 | void timer_interrupt(struct pt_regs * regs) |
323 | { | 323 | { |
324 | int next_dec; | 324 | int next_dec; |
325 | unsigned long cur_tb; | 325 | unsigned long cur_tb; |
@@ -377,8 +377,6 @@ int timer_interrupt(struct pt_regs * regs) | |||
377 | } | 377 | } |
378 | 378 | ||
379 | irq_exit(); | 379 | irq_exit(); |
380 | |||
381 | return 1; | ||
382 | } | 380 | } |
383 | 381 | ||
384 | /* | 382 | /* |