summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/suspend.c
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2010-11-05 18:22:08 -0700
committerTodd Poynor <toddpoynor@google.com>2010-11-05 19:10:28 -0700
commit7935def33e4090ddbd1ed4c70439952073fde5f7 (patch)
treec8bd6dda9030a21ac703309d370732118136bd74 /arch/arm/mach-tegra/suspend.c
parent86d007b0f88e0bcc859923cb3d13dc310d5bf057 (diff)
ARM: tegra: Don't include idle time in irqsoff/preemptoff tracers
Surprise bonus change: Rename tegra_enter_idle to more accurately reflect what it does. Change-Id: I1237e1271df693c109b9db8b47421f8a4c3043c3 Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'arch/arm/mach-tegra/suspend.c')
-rw-r--r--arch/arm/mach-tegra/suspend.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c
index 8c7d0a9ffe93..f691e906eb0e 100644
--- a/arch/arm/mach-tegra/suspend.c
+++ b/arch/arm/mach-tegra/suspend.c
@@ -365,6 +365,7 @@ unsigned int tegra_suspend_lp2(unsigned int us)
tegra_lp2_set_trigger(us);
suspend_cpu_complex();
+ stop_critical_timings();
flush_cache_all();
/* structure is written by reset code, so the L2 lines
* must be invalidated */
@@ -375,6 +376,7 @@ unsigned int tegra_suspend_lp2(unsigned int us)
/* return from __cortex_a9_restore */
barrier();
restore_cpu_complex();
+ start_critical_timings();
remain = tegra_lp2_timer_remain();
if (us)