commit 7831c08b5d4881863f8fdb3b06ada656a7bd07a6
author Pratik Patel <pratikp@codeaurora.org> Wed Jun 08 21:44:37 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:20:29 2011 -0700
tree fa8e82d10ebeea5175f6943265cc8be1ff271662
parent 20ec38a9ae268e10f6cc4440ae543bd9e03becb1

msm: qdss: coresight PFT tracing support

Initial version of the PFT trace driver.

CRs-Fixed: 305958
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

arch/arm/mach-msm/idle-v7.S

diff --git a/arch/arm/mach-msm/idle-v7.S b/arch/arm/mach-msm/idle-v7.S
index 5215c24..20dbd39 100644
--- a/arch/arm/mach-msm/idle-v7.S
+++ b/arch/arm/mach-msm/idle-v7.S
@@ -32,21 +32,15 @@
 #endif
 
 ENTRY(msm_arch_idle)
-	stmfd   sp!, {lr}
 #ifdef CONFIG_MSM_JTAG_V7
+	stmfd   sp!, {lr}
 	bl      msm_save_jtag_debug
 #endif
-#ifdef CONFIG_MSM_ETM
-	bl      etm_save_reg_check
-#endif
 	wfi
-#ifdef CONFIG_MSM_ETM
-	bl      etm_restore_reg_check
-#endif
 #ifdef CONFIG_MSM_JTAG_V7
 	bl      msm_restore_jtag_debug
-#endif
 	ldmfd   sp!, {lr}
+#endif
 	bx	lr
 
 ENTRY(msm_pm_collapse)
@@ -94,7 +88,7 @@
 #ifdef CONFIG_MSM_JTAG_V7
 	bl      msm_save_jtag_debug
 #endif
-#ifdef CONFIG_MSM_ETM
+#ifdef CONFIG_MSM_TRACE_ACROSS_PC
 	bl      etm_save_reg_check
 #endif
 	bl      v7_flush_dcache_all
@@ -119,7 +113,7 @@
 #if defined(CONFIG_MSM_FIQ_SUPPORT)
 	cpsie   f
 #endif
-#ifdef CONFIG_MSM_ETM
+#ifdef CONFIG_MSM_TRACE_ACROSS_PC
 	bl	etm_restore_reg_check
 #endif
 #ifdef CONFIG_MSM_JTAG_V7
@@ -207,7 +201,7 @@
 	isb
 	stmfd   sp!, {lr}
 	bl      v7_flush_kern_cache_all
-#ifdef CONFIG_MSM_ETM
+#ifdef CONFIG_MSM_TRACE_ACROSS_PC
 	bl      etm_restore_reg_check
 #endif
 #ifdef CONFIG_MSM_JTAG_V7