From 61bb9dc40395257fa1dc15d267496e3deb32a3e5 Mon Sep 17 00:00:00 2001 From: Preetham Chandru Ramchandra Date: Thu, 17 Jan 2019 22:37:39 +0530 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1997950 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu Reviewed-by: mobile promotions Tested-by: mobile promotions (cherry picked from commit eb887094e4f4446e6eed9c17e88f4a36ac5ae972) Reviewed-on: https://git-master.nvidia.com/r/2000831 --- include/linux/nv-p2p.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/linux') 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 @@ /* - * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -40,7 +40,6 @@ #include #include #include -#include #define NVIDIA_P2P_UNINITIALIZED 0x0 #define NVIDIA_P2P_PINNED 0x1 @@ -64,7 +63,7 @@ struct nvidia_p2p_page_table { struct mm_struct *mm; struct mmu_notifier mn; - struct nvgpu_mutex lock; + struct mutex lock; void (*free_callback)(void *data); void *data; }; -- cgit v1.2.2