diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-14 14:06:01 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-14 14:06:01 +0530 |
| commit | 08f0a2e4211ab0d75862d939440f3fde0a082266 (patch) | |
| tree | 2e0894d92be993345823a85ec3773e9432f684af /arch | |
| parent | 85d8bb90e69076e6917531ed94e44397e4c4a03a (diff) | |
| parent | 5a7997f3fb084ebf162f9481cd27bb2b1af390a5 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/usb/host/ehci-tegra.c
include/linux/usb.h
include/linux/usb/hcd.h
Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c
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 + |