diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-10-11 02:06:59 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-16 15:52:14 +1000 |
| commit | 7d2bd30f67e231920091d55d0fffc3a4bf43e68a (patch) | |
| tree | 2699f7cd42aa3aed8d55de51e70dd110276419e9 /arch/ppc | |
| parent | bb579cf1d413b930be0241987b848e0f0c1b292f (diff) | |
| download | kernel_samsung_smdk4412-7d2bd30f67e231920091d55d0fffc3a4bf43e68a.zip kernel_samsung_smdk4412-7d2bd30f67e231920091d55d0fffc3a4bf43e68a.tar.gz kernel_samsung_smdk4412-7d2bd30f67e231920091d55d0fffc3a4bf43e68a.tar.bz2 | |
[POWERPC] ppc: Add missing calls to set_irq_regs
In the timer_interrupt we were not calling set_irq_regs() and if we are
profiling we will end up calling get_irq_regs(). This causes bad things to
happen.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/time.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index d4b2cf7..18ee851 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -62,6 +62,7 @@ #include <asm/cache.h> #include <asm/8xx_immap.h> #include <asm/machdep.h> +#include <asm/irq_regs.h> #include <asm/time.h> @@ -129,6 +130,7 @@ void wakeup_decrementer(void) */ void timer_interrupt(struct pt_regs * regs) { + struct pt_regs *old_regs; int next_dec; unsigned long cpu = smp_processor_id(); unsigned jiffy_stamp = last_jiffy_stamp(cpu); @@ -137,6 +139,7 @@ void timer_interrupt(struct pt_regs * regs) if (atomic_read(&ppc_n_lost_interrupts) != 0) do_IRQ(regs); + old_regs = set_irq_regs(regs); irq_enter(); while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) { @@ -188,6 +191,7 @@ void timer_interrupt(struct pt_regs * regs) ppc_md.heartbeat(); irq_exit(); + set_irq_regs(old_regs); } /* |