diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-11 14:39:21 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-12 10:01:12 -0400 |
commit | 7665421874e66f0b00d52a5f1db5210895a9ab7b (patch) | |
tree | 039b5523ae1b44330c1d37bae145daf855714b2e /drivers/gpu/nvgpu/common | |
parent | fb1f604f41435a206b866fba87d36bbc3e9ae474 (diff) |
gpu: nvgpu: Replace use of bitops.h and kernel.h
Remove use of linux/kernel.h and linux/compiler.h. We don't use
anything in those headers.
Also replace use of linux/bitops.h with new wrapper nvgpu/bitops.h.
JIRA NVGPU-13
Change-Id: Iefa6b4598d5a5e7fc386c0a7a554e778a87010d6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1460777
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/kmem.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/bitmap_allocator.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/buddy_allocator.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/lockless_allocator.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/page_allocator.c | 3 |
7 files changed, 3 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index ce9a4176..c0976aa2 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |||
@@ -18,9 +18,9 @@ | |||
18 | #include <linux/cdev.h> | 18 | #include <linux/cdev.h> |
19 | #include <linux/file.h> | 19 | #include <linux/file.h> |
20 | #include <linux/anon_inodes.h> | 20 | #include <linux/anon_inodes.h> |
21 | #include <linux/bitops.h> | ||
22 | #include <uapi/linux/nvgpu.h> | 21 | #include <uapi/linux/nvgpu.h> |
23 | 22 | ||
23 | #include <nvgpu/bitops.h> | ||
24 | #include <nvgpu/kmem.h> | 24 | #include <nvgpu/kmem.h> |
25 | 25 | ||
26 | #include "ioctl_ctrl.h" | 26 | #include "ioctl_ctrl.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/common/linux/kmem.c index 86484888..87aeb184 100644 --- a/drivers/gpu/nvgpu/common/linux/kmem.c +++ b/drivers/gpu/nvgpu/common/linux/kmem.c | |||
@@ -14,7 +14,6 @@ | |||
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 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
19 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
20 | #include <linux/atomic.h> | 19 | #include <linux/atomic.h> |
diff --git a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c b/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c index b32da945..88051b38 100644 --- a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c | |||
@@ -14,9 +14,7 @@ | |||
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 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <nvgpu/bitops.h> |
18 | #include <linux/bitops.h> | ||
19 | |||
20 | #include <nvgpu/allocator.h> | 18 | #include <nvgpu/allocator.h> |
21 | #include <nvgpu/kmem.h> | 19 | #include <nvgpu/kmem.h> |
22 | 20 | ||
diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c index 06cd7911..81f82c60 100644 --- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c | |||
@@ -14,8 +14,6 @@ | |||
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 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | |||
19 | #include <nvgpu/allocator.h> | 17 | #include <nvgpu/allocator.h> |
20 | #include <nvgpu/kmem.h> | 18 | #include <nvgpu/kmem.h> |
21 | 19 | ||
diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c index ed9dadd3..93c870b5 100644 --- a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c | |||
@@ -14,7 +14,6 @@ | |||
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 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/atomic.h> | 17 | #include <linux/atomic.h> |
19 | 18 | ||
20 | #include <nvgpu/allocator.h> | 19 | #include <nvgpu/allocator.h> |
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c index b8e713eb..b84855b5 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | |||
@@ -16,8 +16,6 @@ | |||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/kernel.h> | ||
20 | |||
21 | #include <nvgpu/allocator.h> | 19 | #include <nvgpu/allocator.h> |
22 | 20 | ||
23 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/mm/page_allocator.c b/drivers/gpu/nvgpu/common/mm/page_allocator.c index 1e5fae3d..41ce28a7 100644 --- a/drivers/gpu/nvgpu/common/mm/page_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/page_allocator.c | |||
@@ -14,10 +14,9 @@ | |||
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 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/bitops.h> | ||
19 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
20 | 18 | ||
19 | #include <nvgpu/bitops.h> | ||
21 | #include <nvgpu/allocator.h> | 20 | #include <nvgpu/allocator.h> |
22 | #include <nvgpu/page_allocator.h> | 21 | #include <nvgpu/page_allocator.h> |
23 | #include <nvgpu/kmem.h> | 22 | #include <nvgpu/kmem.h> |