summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorTony Lindgren2011-03-11 18:39:58 +0100
committerTony Lindgren2011-03-11 18:39:58 +0100
commit0d9596958d0be59e6bb373b5e6bc0729cbba5110 (patch)
tree516886b4e5a626c4b8c6d013e631b7234ef34128 /arch/arm/mach-omap2/pm34xx.c
parentMerge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integ... (diff)
parentperf: add OMAP support for the new power events (diff)
downloadkernel-qcow2-linux-0d9596958d0be59e6bb373b5e6bc0729cbba5110.tar.gz
kernel-qcow2-linux-0d9596958d0be59e6bb373b5e6bc0729cbba5110.tar.xz
kernel-qcow2-linux-0d9596958d0be59e6bb373b5e6bc0729cbba5110.zip
Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r--arch/arm/mach-omap2/pm34xx.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index b5361a1260fc..0c5e3a46a3ad 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -29,6 +29,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/console.h>
+#include <trace/events/power.h>
#include <plat/sram.h>
#include "clockdomain.h"
@@ -514,8 +515,14 @@ static void omap3_pm_idle(void)
if (omap_irq_pending() || need_resched())
goto out;
+ trace_power_start(POWER_CSTATE, 1, smp_processor_id());
+ trace_cpu_idle(1, smp_processor_id());
+
omap_sram_idle();
+ trace_power_end(smp_processor_id());
+ trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
+
out:
local_fiq_enable();
local_irq_enable();