diff options
author | Preetham Chandru Ramchandra <pchandru@nvidia.com> | 2019-01-17 12:07:39 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2019-01-22 22:14:57 -0500 |
commit | 61bb9dc40395257fa1dc15d267496e3deb32a3e5 (patch) | |
tree | 1e7d152b857260a3b4ddc54d82d50776a64cd92d /include | |
parent | dbb014e34f89298391d65ca2177baac43b60455e (diff) |
gpu: nvgpu: nvgpu locks to vanilla Linux locks
Replace nvgpu locks to vanilla Linux locks. For the custom kernel
driver when they include nv-p2p.h, nvgpu/linux/lock.h will not be
available because nvgpu/linux/lock.h is not copied to
/usr/src/kernel_header_file.
Bug 200438879
Change-Id: I55b52c6f791970650388b7d51c4d30b5fe75bbb8
Signed-off-by: Preetham Chandru Ramchandra <pchandru@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1997950
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
(cherry picked from commit eb887094e4f4446e6eed9c17e88f4a36ac5ae972)
Reviewed-on: https://git-master.nvidia.com/r/2000831
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nv-p2p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/nv-p2p.h b/include/linux/nv-p2p.h index c1dee7cf..40e82796 100644 --- a/include/linux/nv-p2p.h +++ b/include/linux/nv-p2p.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -40,7 +40,6 @@ | |||
40 | #include <linux/highmem.h> | 40 | #include <linux/highmem.h> |
41 | #include <linux/mutex.h> | 41 | #include <linux/mutex.h> |
42 | #include <linux/spinlock.h> | 42 | #include <linux/spinlock.h> |
43 | #include <nvgpu/linux/lock.h> | ||
44 | 43 | ||
45 | #define NVIDIA_P2P_UNINITIALIZED 0x0 | 44 | #define NVIDIA_P2P_UNINITIALIZED 0x0 |
46 | #define NVIDIA_P2P_PINNED 0x1 | 45 | #define NVIDIA_P2P_PINNED 0x1 |
@@ -64,7 +63,7 @@ struct nvidia_p2p_page_table { | |||
64 | 63 | ||
65 | struct mm_struct *mm; | 64 | struct mm_struct *mm; |
66 | struct mmu_notifier mn; | 65 | struct mmu_notifier mn; |
67 | struct nvgpu_mutex lock; | 66 | struct mutex lock; |
68 | void (*free_callback)(void *data); | 67 | void (*free_callback)(void *data); |
69 | void *data; | 68 | void *data; |
70 | }; | 69 | }; |