From 79b10cbcf7d1544dd5acfda6ba1ab79c4c855377 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Mon, 27 Aug 2018 14:17:08 +0300 Subject: gpu: nvgpu: fix channel include guards The common channel header was missing include guards, so add them. Also rename the Linux channel header guard that was in conflict. Jira NVGPU-967 Change-Id: If782407ef1497202196a362893ef9c1b2330977a Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1807372 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/channel.h | 5 +++++ drivers/gpu/nvgpu/os/linux/channel.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/include/nvgpu/channel.h b/drivers/gpu/nvgpu/include/nvgpu/channel.h index 604083d4..7434f0e7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/channel.h +++ b/drivers/gpu/nvgpu/include/nvgpu/channel.h @@ -20,6 +20,9 @@ * DEALINGS IN THE SOFTWARE. */ +#ifndef NVGPU_CHANNEL_H +#define NVGPU_CHANNEL_H + #include #include "gk20a/gk20a.h" @@ -50,3 +53,5 @@ static inline void trace_write_pushbuffers(struct channel_gk20a *c, int count) { } #endif + +#endif diff --git a/drivers/gpu/nvgpu/os/linux/channel.h b/drivers/gpu/nvgpu/os/linux/channel.h index 87231a79..2210678d 100644 --- a/drivers/gpu/nvgpu/os/linux/channel.h +++ b/drivers/gpu/nvgpu/os/linux/channel.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef __NVGPU_CHANNEL_H__ -#define __NVGPU_CHANNEL_H__ +#ifndef NVGPU_LINUX_CHANNEL_H +#define NVGPU_LINUX_CHANNEL_H #include #include @@ -84,4 +84,4 @@ struct channel_gk20a *gk20a_open_new_channel_with_cb(struct gk20a *g, int runlist_id, bool is_privileged_channel); -#endif /* __NVGPU_CHANNEL_H__ */ +#endif -- cgit v1.2.2