diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-07-13 12:56:13 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-15 10:41:41 -0700 |
| commit | 99b8fbcbbdcd0aa309979756f7e37c005489659e (patch) | |
| tree | 58eaabace20af21179f1cf266529faa1a2b8c781 | |
| parent | a291c3b17bd980748edd409e40bc6b632a7b3968 (diff) | |
ARM: tegra: power: Don't use suspended kernel time
Do not use kernel time to time-stamp Tegra3 CPU ULP/G mode switch in
late suspend/early resume when timekeeping is suspended.
Change-Id: Idb6c8f8c2dd2cfc1e00cec53392de12131d6bbe1
Reviewed-on: http://git-master/r/40958
Tested-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Narendra Damahe <ndamahe@nvidia.com>
Reviewed-by: Chih-Lung Huang <lhuang@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/suspend-t3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/suspend-t3.c b/arch/arm/mach-tegra/suspend-t3.c index 59c631a407d7..0734b0f07f04 100644 --- a/arch/arm/mach-tegra/suspend-t3.c +++ b/arch/arm/mach-tegra/suspend-t3.c @@ -298,7 +298,7 @@ int tegra_cluster_control(unsigned int us, unsigned int flags) if (flags & TEGRA_POWER_CLUSTER_IMMEDIATE) us = 0; - if (current_cluster != target_cluster) { + if ((current_cluster != target_cluster) && (!timekeeping_suspended)) { ktime_t now = ktime_get(); if (target_cluster == TEGRA_POWER_CLUSTER_G) { s64 t = ktime_to_us(ktime_sub(now, last_g2lp)); |