diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2013-12-31 13:46:58 +0200 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2014-01-22 16:02:54 -0800 |
| commit | 2a09de085f8b9c4745cd01d8dddd86dc9efb7472 (patch) | |
| tree | 7d4c3b327f4926f731cba90be2070699246ddee6 /include/trace | |
| parent | 035e5300deab7a6102cacb98609e73f727771bbf (diff) | |
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>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/nvpower.h | 7 | ||||
| -rw-r--r-- | include/trace/events/nvsecurity.h | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/trace/events/nvpower.h b/include/trace/events/nvpower.h index 3671516a297e..75dbdf25042e 100644 --- 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 ca059af60711..916e8995aeb5 100644 --- 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, |