diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2014-06-17 02:45:16 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:01 -0400 |
commit | 7e470c49a65a02dd0318cc552f41a219fc6a11a5 (patch) | |
tree | 8ef7f4eaeed62b7fb37671de3ce81327398a6673 /drivers/gpu | |
parent | 18939e4b4a680a8e01bbec864b267e193fb3714d (diff) |
gpu: nvgpu: Create trace events last
Otherwise other trace event headers included may also be created, which
leads to duplicate definition issues in the 3.14 kernel.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 2adf8908..6de264f4 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -18,9 +18,6 @@ | |||
18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define CREATE_TRACE_POINTS | ||
22 | #include <trace/events/gk20a.h> | ||
23 | |||
24 | #include <linux/module.h> | 21 | #include <linux/module.h> |
25 | #include <linux/dma-mapping.h> | 22 | #include <linux/dma-mapping.h> |
26 | #include <linux/highmem.h> | 23 | #include <linux/highmem.h> |
@@ -47,7 +44,6 @@ | |||
47 | #include <linux/sched.h> | 44 | #include <linux/sched.h> |
48 | #include <linux/input-cfboost.h> | 45 | #include <linux/input-cfboost.h> |
49 | 46 | ||
50 | |||
51 | #include "gk20a.h" | 47 | #include "gk20a.h" |
52 | #include "debug_gk20a.h" | 48 | #include "debug_gk20a.h" |
53 | #include "ctrl_gk20a.h" | 49 | #include "ctrl_gk20a.h" |
@@ -61,6 +57,9 @@ | |||
61 | #include "dbg_gpu_gk20a.h" | 57 | #include "dbg_gpu_gk20a.h" |
62 | #include "hal.h" | 58 | #include "hal.h" |
63 | 59 | ||
60 | #define CREATE_TRACE_POINTS | ||
61 | #include <trace/events/gk20a.h> | ||
62 | |||
64 | #ifdef CONFIG_ARM64 | 63 | #ifdef CONFIG_ARM64 |
65 | #define __cpuc_flush_dcache_area __flush_dcache_area | 64 | #define __cpuc_flush_dcache_area __flush_dcache_area |
66 | #endif | 65 | #endif |