From 8f774fc86677986c8d43ea3b24079f88749855f0 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@freescale.com>
Date: Mon, 19 Sep 2005 09:30:27 -0500
Subject: [PATCH] --- yaml --- r: 11443 b: refs/heads/master c:
 c7aeffc4d38f0573b05bf5ebd2f037997ec9d075 h: refs/heads/master i:   11441:
 6a043465834f052871d7b81a6ad22d5a260801c2   11439:
 0be957947e8a047a133f037c9cbeeb1346a0d80c v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ppc64/kernel/time.c   | 4 +---
 trunk/include/asm-ppc64/hw_irq.h | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index da2314f1f60e..bdd0ea4f815e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82cd02c16be99cba6a97d38488aee8807580a202
+refs/heads/master: c7aeffc4d38f0573b05bf5ebd2f037997ec9d075
diff --git a/trunk/arch/ppc64/kernel/time.c b/trunk/arch/ppc64/kernel/time.c
index 9939c206afa4..fb4bf0ad8f32 100644
--- a/trunk/arch/ppc64/kernel/time.c
+++ b/trunk/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/trunk/include/asm-ppc64/hw_irq.h b/trunk/include/asm-ppc64/hw_irq.h
index baea40e695ec..c483897b8757 100644
--- a/trunk/include/asm-ppc64/hw_irq.h
+++ b/trunk/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