lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sparc64 irq pt_regs fallout

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2006-10-09 11:51:14 +01:00
committed by Linus Torvalds
parent 58ba81dba7
commit 63540ba369
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/sparc64/kernel/irq.c
View File

@@ -522,12 +522,13 @@ void ack_bad_irq(unsigned int virt_irq)
} }
#ifndef CONFIG_SMP #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) void timer_irq(int irq, struct pt_regs *regs)
{ {
unsigned long clr_mask = 1 << irq; unsigned long clr_mask = 1 << irq;
unsigned long tick_mask = tick_ops->softint_mask; unsigned long tick_mask = tick_ops->softint_mask;
struct pt_regs *old_regs;
if (get_softint() & tick_mask) { if (get_softint() & tick_mask) {
irq = 0; irq = 0;
@@ -535,12 +536,14 @@ void timer_irq(int irq, struct pt_regs *regs)
} }
clear_softint(clr_mask); clear_softint(clr_mask);
old_regs = set_irq_regs(regs);
irq_enter(); irq_enter();
kstat_this_cpu.irqs[0]++; kstat_this_cpu.irqs[0]++;
timer_interrupt(irq, NULL, regs); timer_interrupt(irq, NULL);
irq_exit(); irq_exit();
set_irq_regs(old_regs);
} }
#endif #endif

7
arch/sparc64/kernel/time.c
View File

@@ -45,6 +45,7 @@
#include <asm/cpudata.h> #include <asm/cpudata.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/irq_regs.h>
DEFINE_SPINLOCK(mostek_lock); DEFINE_SPINLOCK(mostek_lock);
DEFINE_SPINLOCK(rtc_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; unsigned long ticks, compare, pstate;
@@ -460,8 +461,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)
do { do {
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING);
update_process_times(user_mode(regs)); update_process_times(user_mode(get_irq_regs()));
#endif #endif
do_timer(1); do_timer(1);