[PATCH] powerpc: unified signature of timer_interrupt() between ppc32/ppc64

Kumar Gala galak at freescale.com
Tue Sep 20 00:30:27 EST 2005


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 at freescale.com>

---
commit 10b5180d0bd68bd485b2c93df22bbd094a9e0a2b
tree d51d9c7b17f62fdd7741c44be6207b2bcb449fc0
parent 9df7c83f98a5479a1614cc77d138820a47a062ca
author Kumar K. Gala <kumar.gala at freescale.com> Wed, 14 Sep 2005 14:56:42 -0500
committer Kumar K. Gala <kumar.gala at freescale.com> Wed, 14 Sep 2005 14:56:42 -0500

 arch/ppc64/kernel/time.c   |    4 +---
 include/asm-ppc64/hw_irq.h |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -319,7 +319,7 @@ unsigned long tb_last_stamp __cacheline_
  * 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 * reg
 	}
 
 	irq_exit();
-
-	return 1;
 }
 
 /*
diff --git a/include/asm-ppc64/hw_irq.h b/include/asm-ppc64/hw_irq.h
--- 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



More information about the Linuxppc64-dev mailing list