diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-05-11 14:10:59 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-17 16:03:24 -0400 |
commit | 136eb33c4ed47a1fd783d8377bdc99319e3c5a86 (patch) | |
tree | ffad5676e5ee8655bc1de32da82066250dd141fc /drivers/gpu/nvgpu/include | |
parent | b4f8cd76e2de025a9bfb5a4836c52a95cd587faa (diff) |
gpu: nvgpu: Make sure there an nvlink.h header for POSIX
This header doesn't have anything in it yet but the header is
now present. A change recently went in that only checked for
__KERNEL__ before falling back to including the QNX header.
This caused the POSIX build in GVS to attempt to include the
QNX header. The QNX src is not synced in userspace dev-kernel
tests builds resulting in a missing header.
JIRA NVGPU-525
Change-Id: I60f29ad69cbed38b6ea47f95ca504dab51fa01e7
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1714083
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvlink.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/posix/nvlink.h | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h index 00f0eda9..59e2009f 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | #ifdef __KERNEL__ | 28 | #ifdef __KERNEL__ |
29 | #include <nvgpu/linux/nvlink.h> | 29 | #include <nvgpu/linux/nvlink.h> |
30 | #elif defined(__NVGPU_POSIX__) | ||
31 | #include <nvgpu/posix/nvlink.h> | ||
30 | #else | 32 | #else |
31 | #include <nvgpu_rmos/include/nvlink.h> | 33 | #include <nvgpu_rmos/include/nvlink.h> |
32 | #endif | 34 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/nvlink.h b/drivers/gpu/nvgpu/include/nvgpu/posix/nvlink.h new file mode 100644 index 00000000..99cf837b --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/posix/nvlink.h | |||
@@ -0,0 +1,24 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | * | ||
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/>. | ||
15 | */ | ||
16 | |||
17 | #ifndef __NVGPU_POSIX_NVLINK_H__ | ||
18 | #define __NVGPU_POSIX_NVLINK_H__ | ||
19 | |||
20 | /* | ||
21 | * Empty... | ||
22 | */ | ||
23 | |||
24 | #endif | ||