diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-10 09:02:02 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-10 12:11:17 +0100 |
| commit | 15ce78dafc08b1c5c3ec8f42070ae37160b5154c (patch) | |
| tree | cdb25c6758ac3fe5ac6f9e151642a4779e2fc742 /drivers/gator/gator_trace_gpu.c | |
| parent | 34d9769988397a1edf93ad1966c167591ab29e79 (diff) | |
gator: Version 5.18
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'drivers/gator/gator_trace_gpu.c')
| -rw-r--r-- | drivers/gator/gator_trace_gpu.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/gator/gator_trace_gpu.c b/drivers/gator/gator_trace_gpu.c index be135b4aac5..6332098e595 100644 --- a/drivers/gator/gator_trace_gpu.c +++ b/drivers/gator/gator_trace_gpu.c @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2010-2013. All rights reserved. + * Copyright (C) ARM Limited 2010-2014. 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 version 2 as @@ -14,8 +14,15 @@ #include <linux/math64.h> #ifdef MALI_SUPPORT +#ifdef MALI_DIR_MIDGARD +/* New DDK Directory structure with kernel/drivers/gpu/arm/midgard*/ +#include "mali_linux_trace.h" +#else +/* Old DDK Directory structure with kernel/drivers/gpu/arm/t6xx*/ #include "linux/mali_linux_trace.h" #endif +#endif + #include "gator_trace_gpu.h" /* @@ -235,7 +242,7 @@ GATOR_DEFINE_PROBE(gpu_activity_stop, TP_PROTO(int gpu_unit, int gpu_core)) mali_gpu_stop(gpu_unit, gpu_core); } -int gator_trace_gpu_start(void) +static int gator_trace_gpu_start(void) { /* * Returns nonzero for installation failed @@ -271,7 +278,7 @@ int gator_trace_gpu_start(void) return 0; } -void gator_trace_gpu_stop(void) +static void gator_trace_gpu_stop(void) { #if defined(MALI_SUPPORT) && (MALI_SUPPORT != MALI_T6xx) if (mali_timeline_trace_registered) { |