--- zzzz-none-000/linux-2.4.17/arch/mips/kernel/old-time.c	2001-09-09 17:43:01.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/arch/mips/kernel/old-time.c	2004-11-24 13:22:35.000000000 +0000
@@ -89,8 +89,7 @@
 			:"r" (timerhi),
 			 "m" (timerlo),
 			 "r" (tmp),
-			 "r" (USECS_PER_JIFFY)
-			:"$1");
+			 "r" (USECS_PER_JIFFY));
 		cached_quotient = quotient;
 	}
 
@@ -442,10 +441,12 @@
 
 void indy_r4k_timer_interrupt (struct pt_regs *regs)
 {
-	static const int INDY_R4K_TIMER_IRQ = 7;
 	int cpu = smp_processor_id();
+	int irq = 7;
 
-	r4k_timer_interrupt (INDY_R4K_TIMER_IRQ, NULL, regs);
+	irq_enter(cpu, irq);
+	r4k_timer_interrupt(irq, NULL, regs);
+	irq_exit(cpu, irq);
 
 	if (softirq_pending(cpu))
 		do_softirq();