Skip to contentSkip to conversation

fix ARCH=ppc timer_interrupt after global pt_regs

PATCH In review Peter Korsgaard 4 participants 5 messages Oct 16, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix ARCH=ppc timer_interrupt after global pt_regs

Hi,

2.6.19-rc2 doesn't boot on arch/ppc (atleast of 4xx), because the 'global-pt_regs' megapatch forgot to fix up the arch/ppc timer_interrupt handler. This patch fixes it.

arch/ppc/kernel/time.c +4 -0
diff -urpN linux-2.6.19-rc2.orig/arch/ppc/kernel/time.c linux-2.6.19-rc2/arch/ppc/kernel/time.c
@@ -56,6 +56,7 @@
 #include <linux/time.h>
 #include <linux/init.h>
 #include <linux/profile.h>
+#include <linux/irq.h>
 
 #include <asm/io.h>
 #include <asm/nvram.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 * re
 	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 * re
 		ppc_md.heartbeat();
 
 	irq_exit();
+	set_irq_regs(old_regs);
 }
 
 /*
Signature · 1 line
Bye, Peter Korsgaard
#1 lore raw
Quoted 5 lines · Peter Korsgaard

Hi,

2.6.19-rc2 doesn't boot on arch/ppc (atleast of 4xx), because the 'global-pt_regs' megapatch forgot to fix up the arch/ppc timer_interrupt handler. This patch fixes it.

Kumar Galak already fixed this on Oct 11 in the powerpc git tree.

Paul, could you send this fix to Linus soon please?

josh

#2 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"JB" == Josh Boyer <[email protected]> writes:

Hi,

JB> Kumar Galak already fixed this on Oct 11 in the powerpc git tree.

Ahh, I didn't notice.

JB> Paul, could you send this fix to Linus soon please?

Yes, please - I spend most of the morning tracking this down.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw
Quoted 11 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"JB" == Josh Boyer <[email protected]> writes:

Hi,

JB> Kumar Galak already fixed this on Oct 11 in the powerpc git tree.

Ahh, I didn't notice.

JB> Paul, could you send this fix to Linus soon please?

Yes, please - I spend most of the morning tracking this down.

Yeah, akpm picked up the patch for -mm.

- k

#4 lore raw
Quoted 9 lines · Kumar Gala
Quoted 6 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"JB" == Josh Boyer <[email protected]> writes:

Hi,

JB> Kumar Galak already fixed this on Oct 11 in the powerpc git tree.

Quoted 7 lines
Quoted 5 lines

Ahh, I didn't notice.

JB> Paul, could you send this fix to Linus soon please?

Yes, please - I spend most of the morning tracking this down.

Yeah, akpm picked up the patch for -mm.

Paul's got this in is powerpc.git tree now so it should go to Linus on his next pull request.

- k