From a280bfc16ec5beecf0e30989a8f4bc7324399ad5 Mon Sep 17 00:00:00 2001 From: Vaibhav Kachore Date: Mon, 18 Feb 2019 12:25:05 +0530 Subject: [PATCH] gpu: nvgpu: rename atomic.h - "nvgpu_rmos/include" path is recently added in Makefile under NV_COMPONENT_INCLUDES. atomic.h file is also present in the same path. - This atomic.h is conflicting with QNX OS's atomic.h which needs to be included in some components. - Hence, renaming atomic.h to rmos_atomic.h Bug 200475265 Change-Id: I2a5c28157d1cf388a526765b688c3fe56a666a09 Signed-off-by: Vaibhav Kachore Reviewed-on: https://git-master.nvidia.com/r/2021821 Reviewed-by: svc-misra-checker Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: Ankur Kishore Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/atomic.h b/drivers/gpu/nvgpu/include/nvgpu/atomic.h index 3edc1fc69..e94f5679e 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/atomic.h +++ b/drivers/gpu/nvgpu/include/nvgpu/atomic.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -27,7 +27,7 @@ #elif defined(__NVGPU_POSIX__) #include #else -#include +#include #endif #define NVGPU_ATOMIC_INIT(i) __nvgpu_atomic_init(i)