diff options
| author | Benjamin Hadad IV <bh4@unc.edu> | 2023-07-10 12:39:12 -0400 |
|---|---|---|
| committer | Benjamin Hadad IV <bh4@unc.edu> | 2023-07-10 12:39:12 -0400 |
| commit | 068e7f4e7208d6c9250ad72208e0b36fd9fdf2f6 (patch) | |
| tree | 89ae37b29c464b532b02056ae4170612cd4eaaa3 /nvdebug.h | |
| parent | 3725b15d5da3e06ef202045d710aa5f15eb72fcc (diff) | |
| parent | 073e8978334a07e0053ee08310743ddf3046d7d2 (diff) | |
Merge branch 'jbakita-wip' of ssh://rtsrv.cs.unc.edu/public/nvdebug into wip
I am merging Mr. Bakita's changes (046d7d2) into this repository.
Diffstat (limited to 'nvdebug.h')
| -rw-r--r-- | nvdebug.h | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -980,7 +980,7 @@ static inline int file2parentgpuidx(const struct file *f) { | |||
| 980 | // was upgraded from Linux 4.9 to 5.10 (r32 -> r34+) | 980 | // was upgraded from Linux 4.9 to 5.10 (r32 -> r34+) |
| 981 | // Note that this is wrong if nvgpu was built without CONFIG_NVGPU_NON_FUSA | 981 | // Note that this is wrong if nvgpu was built without CONFIG_NVGPU_NON_FUSA |
| 982 | // i.e. if FUSA was enabled, this is wrong. | 982 | // i.e. if FUSA was enabled, this is wrong. |
| 983 | #define gk20a_regs(gk20a) ((void*)gk20a + sizeof(void(*)(void))) | 983 | #define gk20a_regs(gk20a) (*(void**)((void*)gk20a + sizeof(void(*)(void)))) |
| 984 | #else | 984 | #else |
| 985 | #include <os/linux/os_linux.h> // For struct nvgpu_os_linux, which holds regs | 985 | #include <os/linux/os_linux.h> // For struct nvgpu_os_linux, which holds regs |
| 986 | #define gk20a_regs(gk20a) (container_of(gk20a, struct nvgpu_os_linux, g)->regs) | 986 | #define gk20a_regs(gk20a) (container_of(gk20a, struct nvgpu_os_linux, g)->regs) |
