aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-16 17:04:50 -0400
committerJohn Stultz <john.stultz@linaro.org>2014-07-23 18:01:45 -0400
commit41fa4215f8e8150bdc5d2a5f8704915f1b059fa8 (patch)
treefe3c52475e314eb7fe7ee5288fe7ea90549e57b9
parentfb31cc153dec0d4bdd9a5d7ce60d61acd04b4304 (diff)
arm: bL_switcher:k Use ktime_get_real_ns()
Use the nanoseconds based interface instead of converting from a timespec. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--arch/arm/common/bL_switcher.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c
index 490f3dced749..6eaddc47c43d 100644
--- a/arch/arm/common/bL_switcher.c
+++ b/arch/arm/common/bL_switcher.c
@@ -58,16 +58,6 @@ static int read_mpidr(void)
58} 58}
59 59
60/* 60/*
61 * Get a global nanosecond time stamp for tracing.
62 */
63static s64 get_ns(void)
64{
65 struct timespec ts;
66 getnstimeofday(&ts);
67 return timespec_to_ns(&ts);
68}
69
70/*
71 * bL switcher core code. 61 * bL switcher core code.
72 */ 62 */
73 63
@@ -224,7 +214,7 @@ static int bL_switch_to(unsigned int new_cluster_id)
224 */ 214 */
225 local_irq_disable(); 215 local_irq_disable();
226 local_fiq_disable(); 216 local_fiq_disable();
227 trace_cpu_migrate_begin(get_ns(), ob_mpidr); 217 trace_cpu_migrate_begin(ktime_get_real_ns(), ob_mpidr);
228 218
229 /* redirect GIC's SGIs to our counterpart */ 219 /* redirect GIC's SGIs to our counterpart */
230 gic_migrate_target(bL_gic_id[ib_cpu][ib_cluster]); 220 gic_migrate_target(bL_gic_id[ib_cpu][ib_cluster]);
@@ -267,7 +257,7 @@ static int bL_switch_to(unsigned int new_cluster_id)
267 tdev->evtdev->next_event, 1); 257 tdev->evtdev->next_event, 1);
268 } 258 }
269 259
270 trace_cpu_migrate_finish(get_ns(), ib_mpidr); 260 trace_cpu_migrate_finish(ktime_get_real_ns(), ib_mpidr);
271 local_fiq_enable(); 261 local_fiq_enable();
272 local_irq_enable(); 262 local_irq_enable();
273 263
@@ -558,7 +548,7 @@ int bL_switcher_get_logical_index(u32 mpidr)
558 548
559static void bL_switcher_trace_trigger_cpu(void *__always_unused info) 549static void bL_switcher_trace_trigger_cpu(void *__always_unused info)
560{ 550{
561 trace_cpu_migrate_current(get_ns(), read_mpidr()); 551 trace_cpu_migrate_current(ktime_get_real_ns(), read_mpidr());
562} 552}
563 553
564int bL_switcher_trace_trigger(void) 554int bL_switcher_trace_trigger(void)