From 7e470c49a65a02dd0318cc552f41a219fc6a11a5 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@nvidia.com>
Date: Mon, 16 Jun 2014 23:45:16 -0700
Subject: 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>
---
 drivers/gpu/nvgpu/gk20a/gk20a.c | 7 +++----
 1 file 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 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/gk20a.h>
-
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/highmem.h>
@@ -47,7 +44,6 @@
 #include <linux/sched.h>
 #include <linux/input-cfboost.h>
 
-
 #include "gk20a.h"
 #include "debug_gk20a.h"
 #include "ctrl_gk20a.h"
@@ -61,6 +57,9 @@
 #include "dbg_gpu_gk20a.h"
 #include "hal.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/gk20a.h>
+
 #ifdef CONFIG_ARM64
 #define __cpuc_flush_dcache_area __flush_dcache_area
 #endif
-- 
cgit v1.2.2