summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Medhurst2013-10-10 13:31:31 -0500
committerJon Medhurst2013-10-11 03:23:14 -0500
commit6f4705753bf6ede126239aa56eb518dfc4397b11 (patch)
tree174b6db0f608329711f68ba52fe6f80069770240
parent059ea10130a6ed13a33a56b72a10e3ae3657e03d (diff)
downloadarm-ds5-gator-6f4705753bf6ede126239aa56eb518dfc4397b11.tar.gz
arm-ds5-gator-6f4705753bf6ede126239aa56eb518dfc4397b11.tar.xz
arm-ds5-gator-6f4705753bf6ede126239aa56eb518dfc4397b11.zip
gator-driver: Fix building on Linux 3.12
In Linux 3.12 the local timer API was removed by commit 060fd304 (ARM: smp: Remove local timer API) so disable the check for this as it stops compilation. We need the check for kernels before 3.12 because otherwise we would get incorrect timing information on A5/A9. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--driver/gator_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/driver/gator_main.c b/driver/gator_main.c
index e0db655..ead7eae 100644
--- a/driver/gator_main.c
+++ b/driver/gator_main.c
@@ -44,9 +44,11 @@ static unsigned long gator_protocol_version = 16;
44#error gator requires the kernel to have CONFIG_HIGH_RES_TIMERS defined to support PC sampling 44#error gator requires the kernel to have CONFIG_HIGH_RES_TIMERS defined to support PC sampling
45#endif 45#endif
46 46
47#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) /* Because CONFIG_LOCAL_TIMERS was removed in 3.12 */
47#if defined(__arm__) && defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS) 48#if defined(__arm__) && defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS)
48#error gator requires the kernel to have CONFIG_LOCAL_TIMERS defined on SMP systems 49#error gator requires the kernel to have CONFIG_LOCAL_TIMERS defined on SMP systems
49#endif 50#endif
51#endif
50 52
51#if (GATOR_PERF_SUPPORT) && (!(GATOR_PERF_PMU_SUPPORT)) 53#if (GATOR_PERF_SUPPORT) && (!(GATOR_PERF_PMU_SUPPORT))
52#ifndef CONFIG_PERF_EVENTS 54#ifndef CONFIG_PERF_EVENTS