From: Len Brown <len.brown@intel.com>
Date: Fri, 24 Apr 2009 14:41:31 +0000 (-0400)
Subject: Merge branch 'hpet' into release
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3869e929bb38499b37f8cd76ec96ab6e5a169efb;p=linux-beck.git

Merge branch 'hpet' into release
---

3869e929bb38499b37f8cd76ec96ab6e5a169efb
diff --cc drivers/acpi/processor_idle.c
index eed3b458ebac,ea23c64bd766..07c7d216c89d
--- a/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);