Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] ITC: Reduce rating for ITC clock if ITCs are drifty
  [IA64] SN2: Fix up sn2_rtc clock
  [IA64] Fix wrong access to irq_desc[] in iosapic_register_intr().
  [IA64] Fix possible race in destroy_and_reserve_irq()
  [IA64] Fix registered interrupt check
  [IA64] Remove a few duplicate includes
  [IA64] Allow smp_call_function_single() to current cpu
  [IA64] fix a few section mismatch warnings

1 files changed, 15 insertions, 1 deletions

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 6c0e9e2e1b82..98cfc90cab1d 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -240,7 +240,21 @@ ia64_init_itm (void)
                 if (!nojitter)
                         itc_jitter_data.itc_jitter = 1;
 #endif
-        }
+        } else
+                /*
+                 * ITC is drifty and we have not synchronized the ITCs in smpboot.c.
+                 * ITC values may fluctuate significantly between processors.
+                 * Clock should not be used for hrtimers. Mark itc as only
+                 * useful for boot and testing.
+                 *
+                 * Note that jitter compensation is off! There is no point of
+                 * synchronizing ITCs since they may be large differentials
+                 * that change over time.
+                 *
+                 * The only way to fix this would be to repeatedly sync the
+                 * ITCs. Until that time we have to avoid ITC.
+                 */
+                clocksource_itc.rating = 50;
 
         /* Setup the CPU local timer tick */
         ia64_cpu_local_tick();