Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7aeffc4 authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[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: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 82cd02c1

arch/ppc64/kernel/time.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}



/*

include/asm-ppc64/hw_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -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