diff options
| author | Colin Cross <ccross@android.com> | 2011-02-12 14:13:29 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-02-12 14:13:29 -0800 |
| commit | 5a7997f3fb084ebf162f9481cd27bb2b1af390a5 (patch) | |
| tree | 90cfb981361dd7483384ec2a255ac347ec2ae182 /arch | |
| parent | 87666eb18a15ffecfbd6108a9e2cb0d54e33ec99 (diff) | |
| parent | 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c index a063c34ecf60..23cb9acc588c 100644 --- a/arch/arm/mach-tegra/cpuidle.c +++ b/arch/arm/mach-tegra/cpuidle.c @@ -445,6 +445,7 @@ static int tegra_idle_enter_lp2(struct cpuidle_device *dev, return tegra_idle_enter_lp3(dev, state); local_irq_disable(); + clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); local_fiq_disable(); enter = ktime_get(); @@ -463,11 +464,9 @@ static int tegra_idle_enter_lp2(struct cpuidle_device *dev, us = ktime_to_us(exit); local_fiq_enable(); + clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); local_irq_enable(); - /* cpu clockevents may have been reset by powerdown */ - hrtimer_peek_ahead_timers(); - smp_rmb(); state->exit_latency = tegra_lp2_exit_latency; state->target_residency = tegra_lp2_exit_latency + |