diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-08-27 07:17:08 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-31 00:43:01 -0400 |
commit | 79b10cbcf7d1544dd5acfda6ba1ab79c4c855377 (patch) | |
tree | 8de531fb3aee179aae762aa989875edb18432ac7 | |
parent | 16ef96d4de646a97cee250b1e178f15d5e0909c3 (diff) |
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 <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1807372
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/channel.h | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/channel.h | 6 |
2 files changed, 8 insertions, 3 deletions
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 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef NVGPU_CHANNEL_H | ||
24 | #define NVGPU_CHANNEL_H | ||
25 | |||
23 | #include <nvgpu/types.h> | 26 | #include <nvgpu/types.h> |
24 | 27 | ||
25 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
@@ -50,3 +53,5 @@ static inline void trace_write_pushbuffers(struct channel_gk20a *c, int count) | |||
50 | { | 53 | { |
51 | } | 54 | } |
52 | #endif | 55 | #endif |
56 | |||
57 | #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 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | #ifndef __NVGPU_CHANNEL_H__ | 16 | #ifndef NVGPU_LINUX_CHANNEL_H |
17 | #define __NVGPU_CHANNEL_H__ | 17 | #define NVGPU_LINUX_CHANNEL_H |
18 | 18 | ||
19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
20 | #include <linux/dma-buf.h> | 20 | #include <linux/dma-buf.h> |
@@ -84,4 +84,4 @@ struct channel_gk20a *gk20a_open_new_channel_with_cb(struct gk20a *g, | |||
84 | int runlist_id, | 84 | int runlist_id, |
85 | bool is_privileged_channel); | 85 | bool is_privileged_channel); |
86 | 86 | ||
87 | #endif /* __NVGPU_CHANNEL_H__ */ | 87 | #endif |