diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-10-11 03:06:59 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-16 01:52:14 -0400 |
commit | 7d2bd30f67e231920091d55d0fffc3a4bf43e68a (patch) | |
tree | 2699f7cd42aa3aed8d55de51e70dd110276419e9 /arch | |
parent | bb579cf1d413b930be0241987b848e0f0c1b292f (diff) |
[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')
-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 d4b2cf74da6a..18ee851e33e3 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #include <asm/cache.h> | 62 | #include <asm/cache.h> |
63 | #include <asm/8xx_immap.h> | 63 | #include <asm/8xx_immap.h> |
64 | #include <asm/machdep.h> | 64 | #include <asm/machdep.h> |
65 | #include <asm/irq_regs.h> | ||
65 | 66 | ||
66 | #include <asm/time.h> | 67 | #include <asm/time.h> |
67 | 68 | ||
@@ -129,6 +130,7 @@ void wakeup_decrementer(void) | |||
129 | */ | 130 | */ |
130 | void timer_interrupt(struct pt_regs * regs) | 131 | void timer_interrupt(struct pt_regs * regs) |
131 | { | 132 | { |
133 | struct pt_regs *old_regs; | ||
132 | int next_dec; | 134 | int next_dec; |
133 | unsigned long cpu = smp_processor_id(); | 135 | unsigned long cpu = smp_processor_id(); |
134 | unsigned jiffy_stamp = last_jiffy_stamp(cpu); | 136 | unsigned jiffy_stamp = last_jiffy_stamp(cpu); |
@@ -137,6 +139,7 @@ void timer_interrupt(struct pt_regs * regs) | |||
137 | if (atomic_read(&ppc_n_lost_interrupts) != 0) | 139 | if (atomic_read(&ppc_n_lost_interrupts) != 0) |
138 | do_IRQ(regs); | 140 | do_IRQ(regs); |
139 | 141 | ||
142 | old_regs = set_irq_regs(regs); | ||
140 | irq_enter(); | 143 | irq_enter(); |
141 | 144 | ||
142 | while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) { | 145 | while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) { |
@@ -188,6 +191,7 @@ void timer_interrupt(struct pt_regs * regs) | |||
188 | ppc_md.heartbeat(); | 191 | ppc_md.heartbeat(); |
189 | 192 | ||
190 | irq_exit(); | 193 | irq_exit(); |
194 | set_irq_regs(old_regs); | ||
191 | } | 195 | } |
192 | 196 | ||
193 | /* | 197 | /* |