--- zzzz-none-000/linux-2.6.28.10/arch/mips/kernel/cevt-smtc.c	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/mips/kernel/cevt-smtc.c	2010-03-09 12:51:36.000000000 +0000
@@ -172,11 +172,12 @@
 	unsigned int mtflags;
 	int cpu;
 	struct clock_event_device *cd;
-	unsigned long nextstamp = 0L;
+	unsigned long nextstamp;
 	unsigned long reference;
 
 
 repeat:
+	nextstamp = 0L;
 	for_each_online_cpu(cpu) {
 	    /*
 	     * Find virtual CPUs within the current VPE who have
@@ -184,37 +185,37 @@
 	     */
 	    local_irq_save(flags);
 	    mtflags = dmt();
-	    if (cpu_data[cpu].vpe_id == vpe &&
-		ISVALID(smtc_nexttime[vpe][cpu])) {
-		reference = (unsigned long)read_c0_count();
-		if ((smtc_nexttime[vpe][cpu] - reference)
-			 > (unsigned long)LONG_MAX) {
-			    smtc_nexttime[vpe][cpu] = 0L;
-			    emt(mtflags);
-			    local_irq_restore(flags);
-			    /*
-			     * We don't send IPIs to ourself.
-			     */
-			    if (cpu != smp_processor_id()) {
-				smtc_send_ipi(cpu, SMTC_CLOCK_TICK, 0);
-			    } else {
-				cd = &per_cpu(mips_clockevent_device, cpu);
-				cd->event_handler(cd);
-			    }
-		} else {
-			/* Local to VPE but Valid Time not yet reached. */
-			if (!ISVALID(nextstamp) ||
-			    IS_SOONER(smtc_nexttime[vpe][cpu], nextstamp,
-			    reference)) {
-				smtc_nextinvpe[vpe] = cpu;
-				nextstamp = smtc_nexttime[vpe][cpu];
-			}
-			emt(mtflags);
-			local_irq_restore(flags);
-		}
-	    } else {
-		emt(mtflags);
-		local_irq_restore(flags);
+        if (cpu_data[cpu].vpe_id == vpe &&
+                ISVALID(smtc_nexttime[vpe][cpu])) {
+            reference = (unsigned long)read_c0_count();
+            if ((smtc_nexttime[vpe][cpu] - reference)
+                    > (unsigned long)LONG_MAX) {
+                smtc_nexttime[vpe][cpu] = 0L;
+                emt(mtflags);
+                local_irq_restore(flags);
+                /*
+                 * We don't send IPIs to ourself.
+                 */
+                if (cpu != smp_processor_id()) {
+                    smtc_send_ipi(cpu, SMTC_CLOCK_TICK, 0);
+                } else {
+                    cd = &per_cpu(mips_clockevent_device, cpu);
+                    cd->event_handler(cd);
+                }
+            } else {
+                /* Local to VPE but Valid Time not yet reached. */
+                if (!ISVALID(nextstamp) ||
+                        IS_SOONER(smtc_nexttime[vpe][cpu], nextstamp,
+                            reference)) {
+                    smtc_nextinvpe[vpe] = cpu;
+                    nextstamp = smtc_nexttime[vpe][cpu];
+                }
+                emt(mtflags);
+                local_irq_restore(flags);
+            }
+        } else {
+            emt(mtflags);
+            local_irq_restore(flags);
 
 	    }
 	}
@@ -275,6 +276,7 @@
 	 * get_c0_compare_int is a hook to allow a platform to return the
 	 * interrupt number of it's liking.
 	 */
+
 	irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
 	if (get_c0_compare_int)
 		irq = get_c0_compare_int();