Commit 63540ba3 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] sparc64 irq pt_regs fallout 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 58ba81db

arch/sparc64/kernel/irq.c

+5 −2
Original line number Diff line number Diff line
@@ -522,12 +522,13 @@ void ack_bad_irq(unsigned int virt_irq) 
}



#ifndef CONFIG_SMP

extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *);

extern irqreturn_t timer_interrupt(int, void *);



void timer_irq(int irq, struct pt_regs *regs)

{

	unsigned long clr_mask = 1 << irq;

	unsigned long tick_mask = tick_ops->softint_mask;

	struct pt_regs *old_regs;



	if (get_softint() & tick_mask) {

		irq = 0;
@@ -535,12 +536,14 @@ void timer_irq(int irq, struct pt_regs *regs) 
	}

	clear_softint(clr_mask);



	old_regs = set_irq_regs(regs);

	irq_enter();



	kstat_this_cpu.irqs[0]++;

	timer_interrupt(irq, NULL, regs);

	timer_interrupt(irq, NULL);



	irq_exit();

	set_irq_regs(old_regs);

}

#endif

arch/sparc64/kernel/time.c

+4 −3
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <asm/cpudata.h>

#include <asm/uaccess.h>

#include <asm/prom.h>

#include <asm/irq_regs.h>



DEFINE_SPINLOCK(mostek_lock);

DEFINE_SPINLOCK(rtc_lock);
@@ -452,7 +453,7 @@ static inline void timer_check_rtc(void) 
	}

}



irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)

irqreturn_t timer_interrupt(int irq, void *dev_id)

{

	unsigned long ticks, compare, pstate;
@@ -460,8 +461,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs) 


	do {

#ifndef CONFIG_SMP

		profile_tick(CPU_PROFILING, regs);

		update_process_times(user_mode(regs));

		profile_tick(CPU_PROFILING);

		update_process_times(user_mode(get_irq_regs()));

#endif

		do_timer(1);