summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-09-19 18:30:27 +0400
committerPaul Mackerras <paulus@samba.org>2005-09-21 13:21:09 +0400
commitc7aeffc4d38f0573b05bf5ebd2f037997ec9d075 (patch)
treec70f8882c04e5ffdf041a71751a0703472606bb9
parent82cd02c16be99cba6a97d38488aee8807580a202 (diff)
downloadlinux-c7aeffc4d38f0573b05bf5ebd2f037997ec9d075.tar.xz
[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>
-rw-r--r--arch/ppc64/kernel/time.c4
-rw-r--r--include/asm-ppc64/hw_irq.h2
2 files changed, 2 insertions, 4 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;
* 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;
}
/*
diff --git a/include/asm-ppc64/hw_irq.h b/include/asm-ppc64/hw_irq.h
index baea40e695ec..c483897b8757 100644
--- a/include/asm-ppc64/hw_irq.h
+++ b/include/asm-ppc64/hw_irq.h
@@ -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