Merge branch 'hpet' into release

diff --cc drivers/acpi/processor_idle.c
index eed3b45,ea23c64..07c7d21
--- 1/drivers/acpi/processor_idle.c
--- 2/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@ -986,7 -986,14 +984,9 @@@ static int acpi_idle_enter_bm(struct cp
                c3_cpu_count--;
                spin_unlock(&c3_lock);
        }
+       kt2 = ktime_get_real();
+       idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
  
 -#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
 -      /* TSC could halt in idle, so notify users */
 -      if (tsc_halts_in_c(ACPI_STATE_C3))
 -              mark_tsc_unstable("TSC halts in idle");
 -#endif
        sleep_ticks = us_to_pm_timer_ticks(idle_time);
        /* Tell the scheduler how much we idled: */
        sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);