From 4995389f6806433c65549250b5ab953611febc40 Mon Sep 17 00:00:00 2001
From: Sourab Gupta <sourabg@nvidia.com>
Date: Tue, 29 Aug 2017 16:24:40 +0530
Subject: gpu: nvgpu: include rmos headers in common headers

Currently nvgpu common header files include the
Linux specific headers protected by __KERNEL__
check.

The patch includes the rmos specific headers when
the common headers (and common nvgpu files, by
extension) are compiled under QNX, so that QNX
specific data structures / type definitions can
be retrieved.

Change-Id: Icb03fdc90f6ef4cff8666a6fd0f0f06b5ef62c97
Signed-off-by: Sourab Gupta <sourabg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1547658
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/nvgpu/include/nvgpu/bitops.h    | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/bug.h       | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/cond.h      | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/kmem.h      | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/lock.h      | 4 ++++
 drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h | 4 ++++
 drivers/gpu/nvgpu/include/nvgpu/thread.h    | 2 ++
 drivers/gpu/nvgpu/include/nvgpu/types.h     | 2 ++
 8 files changed, 20 insertions(+)

diff --git a/drivers/gpu/nvgpu/include/nvgpu/bitops.h b/drivers/gpu/nvgpu/include/nvgpu/bitops.h
index 8b5cff0a..4e78e8b2 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bitops.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bitops.h
@@ -16,6 +16,8 @@
 #ifdef __KERNEL__
 #include <linux/bitops.h>
 #include <linux/bitmap.h>
+#else
+#include <nvgpu_rmos/include/bitops.h>
 #endif
 
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bug.h b/drivers/gpu/nvgpu/include/nvgpu/bug.h
index 771383ba..4fe94fff 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bug.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bug.h
@@ -15,6 +15,8 @@
 
 #ifdef __KERNEL__
 #include <linux/bug.h>
+#else
+#include <nvgpu_rmos/include/bug.h>
 #endif
 
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/cond.h b/drivers/gpu/nvgpu/include/nvgpu/cond.h
index 9cd2c93f..7a5d3979 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/cond.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/cond.h
@@ -19,6 +19,8 @@
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/cond.h>
+#else
+#include <nvgpu_rmos/include/cond.h>
 #endif
 
 /*
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
index 5bda2f3a..ff4b7820 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/kmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
@@ -34,6 +34,8 @@ struct gk20a;
  */
 #ifdef __KERNEL__
 #include <nvgpu/linux/kmem.h>
+#else
+#include <nvgpu_rmos/include/kmem.h>
 #endif
 
 /**
diff --git a/drivers/gpu/nvgpu/include/nvgpu/lock.h b/drivers/gpu/nvgpu/include/nvgpu/lock.h
index e9d7e81e..a8ef919d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/lock.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/lock.h
@@ -17,7 +17,11 @@
 #ifndef NVGPU_LOCK_H
 #define NVGPU_LOCK_H
 
+#ifdef __KERNEL__
 #include <nvgpu/linux/lock.h>
+#else
+#include <nvgpu_rmos/include/lock.h>
+#endif
 
 /*
  * struct nvgpu_mutex
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
index 63439e6f..5aa09f3d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
@@ -20,7 +20,11 @@
 #include <nvgpu/types.h>
 #include <nvgpu/list.h>
 
+#ifdef __KERNEL__
 #include <nvgpu/linux/nvgpu_mem.h>
+#else
+#include <nvgpu_rmos/include/nvgpu_mem.h>
+#endif
 
 struct page;
 struct sg_table;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/thread.h b/drivers/gpu/nvgpu/include/nvgpu/thread.h
index 1e946119..0404c6cd 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/thread.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/thread.h
@@ -19,6 +19,8 @@
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/thread.h>
+#else
+#include <nvgpu_rmos/include/thread.h>
 #endif
 
 /**
diff --git a/drivers/gpu/nvgpu/include/nvgpu/types.h b/drivers/gpu/nvgpu/include/nvgpu/types.h
index 4bfdddb7..031293f8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/types.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/types.h
@@ -15,6 +15,8 @@
 
 #ifdef __KERNEL__
 #include <linux/types.h>
+#else
+#include <nvgpu_rmos/include/types.h>
 #endif
 
 #endif
-- 
cgit v1.2.2