diff -urN oldtree/arch/alpha/kernel/time.c newtree/arch/alpha/kernel/time.c
--- oldtree/arch/alpha/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/alpha/kernel/time.c	2006-08-19 17:19:07.700297000 -0400
@@ -132,7 +132,7 @@
 	nticks = delta >> FIX_SHIFT;
 
 	while (nticks > 0) {
-		do_timer(1);
+		do_timer(regs);
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/arm/kernel/time.c newtree/arch/arm/kernel/time.c
--- oldtree/arch/arm/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/arm/kernel/time.c	2006-08-19 17:19:07.712297750 -0400
@@ -333,7 +333,7 @@
 	profile_tick(CPU_PROFILING, regs);
 	do_leds();
 	do_set_rtc();
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/arm26/kernel/time.c newtree/arch/arm26/kernel/time.c
--- oldtree/arch/arm26/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/arm26/kernel/time.c	2006-08-19 17:19:07.720298250 -0400
@@ -194,7 +194,7 @@
 
 static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        do_timer(1);
+        do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/cris/arch-v10/kernel/time.c newtree/arch/cris/arch-v10/kernel/time.c
--- oldtree/arch/cris/arch-v10/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/cris/arch-v10/kernel/time.c	2006-08-19 17:19:07.728298750 -0400
@@ -227,7 +227,7 @@
 	
 	/* call the real timer interrupt handler */
 
-	do_timer(1);
+	do_timer(regs);
 	
         cris_do_profile(regs); /* Save profiling information */
 
diff -urN oldtree/arch/cris/arch-v32/kernel/time.c newtree/arch/cris/arch-v32/kernel/time.c
--- oldtree/arch/cris/arch-v32/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/cris/arch-v32/kernel/time.c	2006-08-19 17:19:07.736299250 -0400
@@ -219,7 +219,7 @@
 		return IRQ_HANDLED;
 
 	/* call the real timer interrupt handler */
-	do_timer(1);
+	do_timer(regs);
 
 	/*
 	 * If we have an externally synchronized Linux clock, then update
diff -urN oldtree/arch/frv/kernel/time.c newtree/arch/frv/kernel/time.c
--- oldtree/arch/frv/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/frv/kernel/time.c	2006-08-19 17:19:07.744299750 -0400
@@ -72,7 +72,7 @@
 	 */
 	write_seqlock(&xtime_lock);
 
-	do_timer(1);
+	do_timer(regs);
 	update_process_times(user_mode(regs));
 	profile_tick(CPU_PROFILING, regs);
 
diff -urN oldtree/arch/h8300/kernel/time.c newtree/arch/h8300/kernel/time.c
--- oldtree/arch/h8300/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/h8300/kernel/time.c	2006-08-19 17:19:07.752300250 -0400
@@ -40,7 +40,7 @@
 	/* may need to kick the hardware timer */
 	platform_timer_eoi();
 
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/ia64/kernel/time.c newtree/arch/ia64/kernel/time.c
--- oldtree/arch/ia64/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/ia64/kernel/time.c	2006-08-19 17:19:07.760300750 -0400
@@ -78,7 +78,7 @@
 			 * xtime_lock.
 			 */
 			write_seqlock(&xtime_lock);
-			do_timer(1);
+			do_timer(regs);
 			local_cpu_data->itm_next = new_itm;
 			write_sequnlock(&xtime_lock);
 		} else
diff -urN oldtree/arch/m32r/kernel/time.c newtree/arch/m32r/kernel/time.c
--- oldtree/arch/m32r/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/m32r/kernel/time.c	2006-08-19 17:19:07.764301000 -0400
@@ -202,7 +202,7 @@
 #ifndef CONFIG_SMP
 	profile_tick(CPU_PROFILING, regs);
 #endif
-	do_timer(1);
+	do_timer(regs);
 
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
diff -urN oldtree/arch/m68k/kernel/time.c newtree/arch/m68k/kernel/time.c
--- oldtree/arch/m68k/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/m68k/kernel/time.c	2006-08-19 17:19:07.772301500 -0400
@@ -39,7 +39,7 @@
  */
 static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
 {
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/m68k/sun3/sun3ints.c newtree/arch/m68k/sun3/sun3ints.c
--- oldtree/arch/m68k/sun3/sun3ints.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/m68k/sun3/sun3ints.c	2006-08-19 17:19:07.780302000 -0400
@@ -65,7 +65,7 @@
 #ifdef CONFIG_SUN3
 	intersil_clear();
 #endif
-        do_timer(1);
+        do_timer(fp);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(fp));
 #endif
diff -urN oldtree/arch/m68knommu/kernel/time.c newtree/arch/m68knommu/kernel/time.c
--- oldtree/arch/m68knommu/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/m68knommu/kernel/time.c	2006-08-19 17:19:07.788302500 -0400
@@ -51,7 +51,7 @@
 
 	write_seqlock(&xtime_lock);
 
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/mips/au1000/common/time.c newtree/arch/mips/au1000/common/time.c
--- oldtree/arch/mips/au1000/common/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/mips/au1000/common/time.c	2006-08-19 17:19:07.796303000 -0400
@@ -96,7 +96,7 @@
 		timerlo = count;
 
 		kstat_this_cpu.irqs[irq]++;
-		do_timer(1);
+		do_timer(regs);
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
@@ -137,7 +137,7 @@
 	}
 
 	while (time_elapsed > 0) {
-		do_timer(1);
+		do_timer(regs);
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
@@ -156,7 +156,7 @@
 
 	if (jiffie_drift >= 999) {
 		jiffie_drift -= 999;
-		do_timer(1); /* increment jiffies by one */
+		do_timer(regs); /* increment jiffies by one */
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/mips/galileo-boards/ev96100/time.c newtree/arch/mips/galileo-boards/ev96100/time.c
--- oldtree/arch/mips/galileo-boards/ev96100/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/mips/galileo-boards/ev96100/time.c	2006-08-19 17:19:07.800303250 -0400
@@ -72,7 +72,7 @@
 
 	do {
 		kstat_this_cpu.irqs[irq]++;
-		do_timer(1);
+		do_timer(regs);
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/mips/gt64120/common/time.c newtree/arch/mips/gt64120/common/time.c
--- oldtree/arch/mips/gt64120/common/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/mips/gt64120/common/time.c	2006-08-19 17:19:07.808303750 -0400
@@ -34,7 +34,7 @@
 	if (irq_src & 0x00000800) {	/* Check for timer interrupt */
 		handled = 1;
 		irq_src &= ~0x00000800;
-		do_timer(1);
+		do_timer(regs);
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/mips/kernel/time.c newtree/arch/mips/kernel/time.c
--- oldtree/arch/mips/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/mips/kernel/time.c	2006-08-19 17:19:07.816304250 -0400
@@ -434,7 +434,7 @@
 	/*
 	 * call the generic timer interrupt handling
 	 */
-	do_timer(1);
+	do_timer(regs);
 
 	/*
 	 * If we have an externally synchronized Linux clock, then update
diff -urN oldtree/arch/mips/momentum/ocelot_g/gt-irq.c newtree/arch/mips/momentum/ocelot_g/gt-irq.c
--- oldtree/arch/mips/momentum/ocelot_g/gt-irq.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/mips/momentum/ocelot_g/gt-irq.c	2006-08-19 17:19:07.820304500 -0400
@@ -133,7 +133,7 @@
 		MV_WRITE(TIMER_COUNTER_0_3_INTERRUPT_CAUSE, 0x0);
 
 		/* handle the timer call */
-		do_timer(1);
+		do_timer(regs);
 #ifndef CONFIG_SMP
 		update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/mips/sgi-ip27/ip27-timer.c newtree/arch/mips/sgi-ip27/ip27-timer.c
--- oldtree/arch/mips/sgi-ip27/ip27-timer.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/mips/sgi-ip27/ip27-timer.c	2006-08-19 17:19:07.828305000 -0400
@@ -111,7 +111,7 @@
 	kstat_this_cpu.irqs[irq]++;		/* kstat only for bootcpu? */
 
 	if (cpu == 0)
-		do_timer(1);
+		do_timer(regs);
 
 	update_process_times(user_mode(regs));
 
diff -urN oldtree/arch/parisc/kernel/time.c newtree/arch/parisc/kernel/time.c
--- oldtree/arch/parisc/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/parisc/kernel/time.c	2006-08-19 17:19:07.832305250 -0400
@@ -79,7 +79,7 @@
 #endif
 		if (cpu == 0) {
 			write_seqlock(&xtime_lock);
-			do_timer(1);
+			do_timer(regs);
 			write_sequnlock(&xtime_lock);
 		}
 	}
diff -urN oldtree/arch/powerpc/kernel/time.c newtree/arch/powerpc/kernel/time.c
--- oldtree/arch/powerpc/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/powerpc/kernel/time.c	2006-08-19 17:19:07.840305750 -0400
@@ -693,7 +693,7 @@
 		write_seqlock(&xtime_lock);
 		tb_last_jiffy += tb_ticks_per_jiffy;
 		tb_last_stamp = per_cpu(last_jiffy, cpu);
-		do_timer(1);
+		do_timer(regs);
 		timer_recalc_offset(tb_last_jiffy);
 		timer_check_rtc();
 		write_sequnlock(&xtime_lock);
diff -urN oldtree/arch/ppc/kernel/time.c newtree/arch/ppc/kernel/time.c
--- oldtree/arch/ppc/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/ppc/kernel/time.c	2006-08-19 17:19:07.848306250 -0400
@@ -153,7 +153,7 @@
 		/* We are in an interrupt, no need to save/restore flags */
 		write_seqlock(&xtime_lock);
 		tb_last_stamp = jiffy_stamp;
-		do_timer(1);
+		do_timer(regs);
 
 		/*
 		 * update the rtc when needed, this should be performed on the
diff -urN oldtree/arch/s390/kernel/time.c newtree/arch/s390/kernel/time.c
--- oldtree/arch/s390/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/s390/kernel/time.c	2006-08-19 17:19:07.852306500 -0400
@@ -166,7 +166,7 @@
 void account_ticks(struct pt_regs *regs)
 {
 	__u64 tmp;
-	__u32 ticks;
+	__u32 ticks, xticks;
 
 	/* Calculate how many ticks have passed. */
 	if (S390_lowcore.int_clock < S390_lowcore.jiffy_timer) {
@@ -204,7 +204,6 @@
 	 */
 	write_seqlock(&xtime_lock);
 	if (S390_lowcore.jiffy_timer > xtime_cc) {
-		__u32 xticks;
 		tmp = S390_lowcore.jiffy_timer - xtime_cc;
 		if (tmp >= 2*CLK_TICKS_PER_JIFFY) {
 			xticks = __div(tmp, CLK_TICKS_PER_JIFFY);
@@ -213,11 +212,13 @@
 			xticks = 1;
 			xtime_cc += CLK_TICKS_PER_JIFFY;
 		}
-		do_timer(xticks);
+		while (xticks--)
+			do_timer(regs);
 	}
 	write_sequnlock(&xtime_lock);
 #else
-	do_timer(ticks);
+	for (xticks = ticks; xticks > 0; xticks--)
+		do_timer(regs);
 #endif
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
diff -urN oldtree/arch/sh/kernel/time.c newtree/arch/sh/kernel/time.c
--- oldtree/arch/sh/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/sh/kernel/time.c	2006-08-19 17:19:07.856306750 -0400
@@ -115,7 +115,7 @@
  */
 void handle_timer_tick(struct pt_regs *regs)
 {
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/sh64/kernel/time.c newtree/arch/sh64/kernel/time.c
--- oldtree/arch/sh64/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/sh64/kernel/time.c	2006-08-19 17:19:07.864307250 -0400
@@ -298,7 +298,7 @@
 	asm ("getcon cr62, %0" : "=r" (current_ctc));
 	ctc_last_interrupt = (unsigned long) current_ctc;
 
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/sparc/kernel/pcic.c newtree/arch/sparc/kernel/pcic.c
--- oldtree/arch/sparc/kernel/pcic.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/sparc/kernel/pcic.c	2006-08-19 17:19:07.868307500 -0400
@@ -712,7 +712,7 @@
 {
 	write_seqlock(&xtime_lock);	/* Dummy, to show that we remember */
 	pcic_clear_clock_irq();
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/sparc/kernel/time.c newtree/arch/sparc/kernel/time.c
--- oldtree/arch/sparc/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/sparc/kernel/time.c	2006-08-19 17:19:07.872307750 -0400
@@ -128,7 +128,7 @@
 #endif
 	clear_clock_irq();
 
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/sparc64/kernel/time.c newtree/arch/sparc64/kernel/time.c
--- oldtree/arch/sparc64/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/sparc64/kernel/time.c	2006-08-19 17:19:07.880308250 -0400
@@ -465,7 +465,7 @@
 		profile_tick(CPU_PROFILING, regs);
 		update_process_times(user_mode(regs));
 #endif
-		do_timer(1);
+		do_timer(regs);
 
 		/* Guarantee that the following sequences execute
 		 * uninterrupted.
@@ -496,7 +496,7 @@
 {
 	write_seqlock(&xtime_lock);
 
-	do_timer(1);
+	do_timer(regs);
 
 	timer_check_rtc();
 
diff -urN oldtree/arch/um/kernel/time.c newtree/arch/um/kernel/time.c
--- oldtree/arch/um/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/um/kernel/time.c	2006-08-19 17:19:07.884308500 -0400
@@ -93,7 +93,7 @@
 
 	write_seqlock_irqsave(&xtime_lock, flags);
 
-	do_timer(1);
+	do_timer(regs);
 
 	nsecs = get_time() + local_offset;
 	xtime.tv_sec = nsecs / NSEC_PER_SEC;
diff -urN oldtree/arch/v850/kernel/time.c newtree/arch/v850/kernel/time.c
--- oldtree/arch/v850/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/v850/kernel/time.c	2006-08-19 17:19:07.888308750 -0400
@@ -50,7 +50,7 @@
 	if (mach_tick)
 	  mach_tick ();
 
-	do_timer (1);
+	do_timer (regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/x86_64/kernel/time.c newtree/arch/x86_64/kernel/time.c
--- oldtree/arch/x86_64/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/x86_64/kernel/time.c	2006-08-19 17:19:07.896309250 -0400
@@ -415,14 +415,16 @@
 				(((long) offset << US_SCALE) / vxtime.tsc_quot) - 1;
 	}
 
-	if (lost > 0)
+	if (lost > 0) {
 		handle_lost_ticks(lost, regs);
+		jiffies += lost;
+	}
 
 /*
  * Do the timer stuff.
  */
 
-	do_timer(lost + 1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/arch/xtensa/kernel/time.c newtree/arch/xtensa/kernel/time.c
--- oldtree/arch/xtensa/kernel/time.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/arch/xtensa/kernel/time.c	2006-08-19 17:19:07.900309500 -0400
@@ -175,7 +175,7 @@
 
 		last_ccount_stamp = next;
 		next += CCOUNT_PER_JIFFY;
-		do_timer (1); /* Linux handler in kernel/timer.c */
+		do_timer (regs); /* Linux handler in kernel/timer.c */
 
 		if (ntp_synced() &&
 		    xtime.tv_sec - last_rtc_update >= 659 &&
diff -urN oldtree/include/asm-arm/arch-clps711x/time.h newtree/include/asm-arm/arch-clps711x/time.h
--- oldtree/include/asm-arm/arch-clps711x/time.h	2006-08-18 15:01:22.000000000 -0400
+++ newtree/include/asm-arm/arch-clps711x/time.h	2006-08-19 17:19:07.904309750 -0400
@@ -29,7 +29,7 @@
 p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	do_leds();
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/include/asm-arm/arch-l7200/time.h newtree/include/asm-arm/arch-l7200/time.h
--- oldtree/include/asm-arm/arch-l7200/time.h	2006-08-18 15:01:22.000000000 -0400
+++ newtree/include/asm-arm/arch-l7200/time.h	2006-08-19 17:19:07.908310000 -0400
@@ -45,7 +45,7 @@
 static irqreturn_t
 timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode(regs));
 #endif
diff -urN oldtree/include/asm-i386/mach-default/do_timer.h newtree/include/asm-i386/mach-default/do_timer.h
--- oldtree/include/asm-i386/mach-default/do_timer.h	2006-08-18 15:01:22.000000000 -0400
+++ newtree/include/asm-i386/mach-default/do_timer.h	2006-08-19 17:19:07.912310250 -0400
@@ -16,7 +16,7 @@
 
 static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 {
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode_vm(regs));
 #endif
diff -urN oldtree/include/asm-i386/mach-visws/do_timer.h newtree/include/asm-i386/mach-visws/do_timer.h
--- oldtree/include/asm-i386/mach-visws/do_timer.h	2006-08-18 15:01:22.000000000 -0400
+++ newtree/include/asm-i386/mach-visws/do_timer.h	2006-08-19 17:19:07.916310500 -0400
@@ -9,7 +9,7 @@
 	/* Clear the interrupt */
 	co_cpu_write(CO_CPU_STAT,co_cpu_read(CO_CPU_STAT) & ~CO_STAT_TIMEINTR);
 
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode_vm(regs));
 #endif
diff -urN oldtree/include/asm-i386/mach-voyager/do_timer.h newtree/include/asm-i386/mach-voyager/do_timer.h
--- oldtree/include/asm-i386/mach-voyager/do_timer.h	2006-08-18 15:01:22.000000000 -0400
+++ newtree/include/asm-i386/mach-voyager/do_timer.h	2006-08-19 17:19:07.920310750 -0400
@@ -3,7 +3,7 @@
 
 static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 {
-	do_timer(1);
+	do_timer(regs);
 #ifndef CONFIG_SMP
 	update_process_times(user_mode_vm(regs));
 #endif
diff -urN oldtree/include/linux/sched.h newtree/include/linux/sched.h
--- oldtree/include/linux/sched.h	2006-08-19 16:57:07.261774750 -0400
+++ newtree/include/linux/sched.h	2006-08-19 17:19:07.932311500 -0400
@@ -1280,7 +1280,7 @@
 
 #include <asm/current.h>
 
-extern void do_timer(unsigned long ticks);
+extern void do_timer(struct pt_regs *);
 
 extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
 extern int FASTCALL(wake_up_process(struct task_struct * tsk));
diff -urN oldtree/kernel/timer.c newtree/kernel/timer.c
--- oldtree/kernel/timer.c	2006-08-18 15:01:22.000000000 -0400
+++ newtree/kernel/timer.c	2006-08-19 17:19:07.936311750 -0400
@@ -1008,8 +1008,10 @@
 	unsigned long active_tasks; /* fixed-point */
 	static int count = LOAD_FREQ;
 
-	active_tasks = count_active_tasks();
-	for (count -= ticks; count < 0; count += LOAD_FREQ) {
+	count -= ticks;
+	if (count < 0) {
+		count += LOAD_FREQ;
+		active_tasks = count_active_tasks();
 		CALC_LOAD(avenrun[0], EXP_1, active_tasks);
 		CALC_LOAD(avenrun[1], EXP_5, active_tasks);
 		CALC_LOAD(avenrun[2], EXP_15, active_tasks);
@@ -1054,8 +1056,11 @@
  * Called by the timer interrupt. xtime_lock must already be taken
  * by the timer IRQ!
  */
-static inline void update_times(unsigned long ticks)
+static inline void update_times(void)
 {
+	unsigned long ticks;
+
+	ticks = jiffies - wall_jiffies;
 	wall_jiffies += ticks;
 	update_wall_time();
 	calc_load(ticks);
@@ -1067,10 +1072,12 @@
  * jiffies is defined in the linker script...
  */
 
-void do_timer(unsigned long ticks)
+void do_timer(struct pt_regs *regs)
 {
-	jiffies_64 += ticks;
-	update_times(ticks);
+	jiffies_64++;
+	/* prevent loading jiffies before storing new jiffies_64 value. */
+	barrier();
+	update_times();
 }
 
 #ifdef __ARCH_WANT_SYS_ALARM