Commit e29f2b50 authored by Ian Wienand's avatar Ian Wienand Committed by David Mosberger

[PATCH] ia64: drop bogus "now < last_tick" message

itc_get_offset() has a consistency check which is no longer valid now that
xtime_lock is a seq_lock.  Drop the bogus check.
parent 27f02e28
...@@ -65,8 +65,12 @@ itc_update (long delta_nsec) ...@@ -65,8 +65,12 @@ itc_update (long delta_nsec)
} }
/* /*
* Return the number of nano-seconds that elapsed since the last update to jiffy. The * Return the number of nano-seconds that elapsed since the last
* xtime_lock must be at least read-locked when calling this routine. * 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 unsigned long
itc_get_offset (void) itc_get_offset (void)
...@@ -77,11 +81,6 @@ itc_get_offset (void) ...@@ -77,11 +81,6 @@ itc_get_offset (void)
last_tick = (cpu_data(TIME_KEEPER_ID)->itm_next last_tick = (cpu_data(TIME_KEEPER_ID)->itm_next
- (lost + 1)*cpu_data(TIME_KEEPER_ID)->itm_delta); - (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; elapsed_cycles = now - last_tick;
return (elapsed_cycles*local_cpu_data->nsec_per_cyc) >> IA64_NSEC_PER_CYC_SHIFT; return (elapsed_cycles*local_cpu_data->nsec_per_cyc) >> IA64_NSEC_PER_CYC_SHIFT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment