arm: tegra: Do not call timer if not available

Change-Id: Ib1a59199ae092ab58598c9d2077d139a1c970aad
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/351024
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>

diff --git a/include/trace/events/nvpower.h b/include/trace/events/nvpower.h
index 3671516a297e8e2db9ac4690186fb30d41b89670..75dbdf25042e254e1fabe69c7b1020562dabca83 100644 (file)
--- a/include/trace/events/nvpower.h
+++ b/include/trace/events/nvpower.h
@@ -3,7 +3,7 @@
  *
  * NVIDIA Tegra specific power events.
  *
- * Copyright (c) 2010-2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2010-2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,7 +73,12 @@ TRACE_EVENT(nvcpu_cluster,
                  (unsigned long)__entry->target)
 );
 
+#ifdef CONFIG_CLK_SRC_TEGRA_TIMER
 extern u32 notrace tegra_read_usec_raw(void);
+#else
+#undef tegra_read_usec_raw
+#define tegra_read_usec_raw() 0
+#endif
 
 TRACE_EVENT(nvcpu_powergate,
 

diff --git a/include/trace/events/nvsecurity.h b/include/trace/events/nvsecurity.h
index ca059af607110a46395ea733451d358f208b8e63..916e8995aeb567d3cb1971452cac1f994fbd9871 100644 (file)
--- a/include/trace/events/nvsecurity.h
+++ b/include/trace/events/nvsecurity.h
@@ -3,7 +3,7 @@
  *
  * Security event logging to ftrace.
  *
- * Copyright (c) 2012, NVIDIA Corporation.
+ * Copyright (c) 2012-2014, NVIDIA Corporation.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,12 @@
 #include <linux/ktime.h>
 #include <linux/tracepoint.h>
 
+#ifdef CONFIG_CLK_SRC_TEGRA_TIMER
 extern u32 notrace tegra_read_usec_raw(void);
+#else
+#undef tegra_read_usec_raw
+#define tegra_read_usec_raw() 0
+#endif
 
 DECLARE_EVENT_CLASS(usec_profiling,