hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Kumar Gala 2005-09-19 09:30:27 -05:00 committed by Paul Mackerras
parent 82cd02c16b
commit c7aeffc4d3
2 changed files with 2 additions and 4 deletions
arch/ppc64/kernel
time.c
include/asm-ppc64
hw_irq.h

4
arch/ppc64/kernel/time.c
View File

@ -319,7 +319,7 @@ unsigned long tb_last_stamp __cacheline_aligned_in_smp;
* timer_interrupt - gets called when the decrementer overflows, * timer_interrupt - gets called when the decrementer overflows,
* with interrupts disabled. * with interrupts disabled.
*/ */
int timer_interrupt(struct pt_regs * regs) void timer_interrupt(struct pt_regs * regs)
{ {
int next_dec; int next_dec;
unsigned long cur_tb; unsigned long cur_tb;
@ -377,8 +377,6 @@ int timer_interrupt(struct pt_regs * regs)
} }
irq_exit(); irq_exit();
return 1;
} }
/* /*

2
include/asm-ppc64/hw_irq.h
View File

@ -16,7 +16,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/irq.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); extern void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq);
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES