---

yaml --- r: 11443 b: refs/heads/master c: c7aeffc h: refs/heads/master i: 11441: 6a04346 11439: 0be9579 v: v3
git-mirror · Sep 21, 2005 · 8f774fc · 8f774fc
1 parent 63b3126
commit 8f774fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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