2 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/atomic.h b/drivers/gpu/nvgpu/include/nvgpu/atomic.h
index 2f3651db..0f319f71 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/atomic.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/atomic.h
@@ -24,6 +24,8 @@
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/atomic.h>
+#else
+#include <nvgpu_rmos/include/atomic.h>
 #endif
 
 #define NVGPU_ATOMIC_INIT(i)    __nvgpu_atomic_init(i)
diff --git a/drivers/gpu/nvgpu/include/nvgpu/barrier.h b/drivers/gpu/nvgpu/include/nvgpu/barrier.h
index 89f60ef2..01bd3023 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/barrier.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/barrier.h
@@ -30,6 +30,8 @@
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/barrier.h>
+#else
+#include <nvgpu_rmos/include/barrier.h>
 #endif
 
 #define nvgpu_mb()      __nvgpu_mb()