Attachment 155255 Details for Bug 240782 – Upstream patch that fixes this issue

[patch] Upstream patch that fixes this issue

time.c.take3.diff (text/plain), 1.19 KB, created by Prarit Bhargava on 2007-05-23 15:00:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2007-05-23 15:00:50 UTC

Size: 1.19 KB

patch

obsolete

>===== arch/ia64/kernel/time.c 1.35 vs edited =====
>--- 1.35/arch/ia64/kernel/time.c	Wed Oct  8 12:53:38 2003
>+++ edited/arch/ia64/kernel/time.c	Wed Oct 15 08:54:31 2003
>@@ -65,8 +65,12 @@
> }
> 
> /*
>- * Return the number of nano-seconds that elapsed since the last update to jiffy.  The
>- * xtime_lock must be at least read-locked when calling this routine.
>+ * Return the number of nano-seconds that elapsed since the last
>+ * update to jiffy.  It is quite possible that the timer interrupt
>+ * will interrupt this and result in a race for any of jiffies,
>+ * wall_jiffies or itm_next.  Thus, the xtime_lock must be at least
>+ * read synchronised when calling this routine (see do_gettimeofday()
>+ * below for an example).
>  */
> unsigned long
> itc_get_offset (void)
>@@ -77,11 +81,6 @@
> 	last_tick = (cpu_data(TIME_KEEPER_ID)->itm_next
> 		     - (lost + 1)*cpu_data(TIME_KEEPER_ID)->itm_delta);
> 
>-	if (unlikely((long) (now - last_tick) < 0)) {
>-		printk(KERN_ERR "CPU %d: now < last_tick (now=0x%lx,last_tick=0x%lx)!\n",
>-		       smp_processor_id(), now, last_tick);
>-		return last_nsec_offset;
>-	}
> 	elapsed_cycles = now - last_tick;
> 	return (elapsed_cycles*local_cpu_data->nsec_per_cyc) >> IA64_NSEC_PER_CYC_SHIFT;
> }
>

Actions: View | Diff

Attachments on bug 240782: 155120 | 155255 | 155283