From 335b3fa2fe89de3ae37d01a8e9605dc74554f777 Mon Sep 17 00:00:00 2001
From: Alex Waterman <alexw@nvidia.com>
Date: Thu, 30 Mar 2017 21:29:46 +0100
Subject: gpu: nvgpu: Remove vmalloc.h and slab.h usage

Remove all usage of vmalloc.h and slab.h outside of the Linux specific
kmem API implementation code.

Bug 1799159
Bug 1823380

Change-Id: I5b2a91bd1057b272efeaddc24902f6133b35024f
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1331703
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/mm/bitmap_allocator.c   | 1 -
 drivers/gpu/nvgpu/common/mm/buddy_allocator.c    | 1 -
 drivers/gpu/nvgpu/common/mm/lockless_allocator.c | 2 --
 drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c    | 1 -
 drivers/gpu/nvgpu/common/mm/page_allocator.c     | 1 -
 drivers/gpu/nvgpu/common/semaphore.c             | 1 -
 drivers/gpu/nvgpu/gk20a/ce2_gk20a.c              | 1 -
 drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c           | 1 -
 drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c      | 1 -
 drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c       | 1 -
 drivers/gpu/nvgpu/gk20a/gk20a_scale.c            | 1 -
 drivers/gpu/nvgpu/gk20a/gr_gk20a.h               | 2 --
 drivers/gpu/nvgpu/gk20a/mm_gk20a.h               | 2 --
 drivers/gpu/nvgpu/gk20a/regops_gk20a.c           | 1 -
 drivers/gpu/nvgpu/gk20a/sync_gk20a.c             | 1 -
 drivers/gpu/nvgpu/gm20b/gr_gm20b.c               | 1 -
 drivers/gpu/nvgpu/gm20b/regops_gm20b.c           | 1 -
 drivers/gpu/nvgpu/gp106/regops_gp106.c           | 1 -
 drivers/gpu/nvgpu/gp10b/gr_gp10b.c               | 1 -
 drivers/gpu/nvgpu/gp10b/regops_gp10b.c           | 1 -
 20 files changed, 23 deletions(-)

(limited to 'drivers')

diff --git a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c b/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c
index 6e3bad6f..b32da945 100644
--- a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/bitops.h>
 
 #include <nvgpu/allocator.h>
diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
index 246be974..06cd7911 100644
--- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
 
 #include <nvgpu/allocator.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
index 19368339..ed9dadd3 100644
--- a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
@@ -15,8 +15,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
 #include <linux/atomic.h>
 
 #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 02b7b48d..b8e713eb 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
 
 #include <nvgpu/allocator.h>
 
diff --git a/drivers/gpu/nvgpu/common/mm/page_allocator.c b/drivers/gpu/nvgpu/common/mm/page_allocator.c
index d74db3e3..1e5fae3d 100644
--- a/drivers/gpu/nvgpu/common/mm/page_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/page_allocator.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/mm.h>
 
diff --git a/drivers/gpu/nvgpu/common/semaphore.c b/drivers/gpu/nvgpu/common/semaphore.c
index 5d526e64..6fb6c27e 100644
--- a/drivers/gpu/nvgpu/common/semaphore.c
+++ b/drivers/gpu/nvgpu/common/semaphore.c
@@ -17,7 +17,6 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/highmem.h>
-#include <linux/slab.h>
 
 #include <nvgpu/semaphore.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index 7aae2584..7cfcd154 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -19,7 +19,6 @@
 
 /*TODO: remove uncecessary */
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include <trace/events/gk20a.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
index 640e6179..98fa53ab 100644
--- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
@@ -19,7 +19,6 @@
 #include <linux/bitops.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-buf.h>
-#include <linux/vmalloc.h>
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/lock.h>
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index 2f6a85a5..cc008844 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -12,7 +12,6 @@
  */
 
 #include <asm/barrier.h>
-#include <linux/slab.h>
 #include <linux/kthread.h>
 #include <linux/circ_buf.h>
 #include <linux/delay.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index dbf67c71..4fa71797 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -12,7 +12,6 @@
  */
 
 #include <asm/barrier.h>
-#include <linux/slab.h>
 #include <linux/kthread.h>
 #include <linux/circ_buf.h>
 #include <linux/delay.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
index 5c1350d3..b411cb5c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
@@ -19,7 +19,6 @@
 #include <linux/devfreq.h>
 #include <linux/debugfs.h>
 #include <linux/export.h>
-#include <linux/slab.h>
 #include <soc/tegra/chip-id.h>
 #include <linux/pm_qos.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 33721f08..3a4d5e04 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -18,7 +18,6 @@
 #ifndef GR_GK20A_H
 #define GR_GK20A_H
 
-#include <linux/slab.h>
 #include <uapi/linux/nvgpu.h>
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include "gr_t18x.h"
@@ -27,7 +26,6 @@
 #include "gr_t19x.h"
 #endif
 
-
 #include "tsg_gk20a.h"
 #include "gr_ctx_gk20a.h"
 #include "mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 795c9259..a16ab588 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -20,8 +20,6 @@
 
 #include <linux/scatterlist.h>
 #include <linux/iommu.h>
-#include <linux/vmalloc.h>
-#include <linux/slab.h>
 #include <linux/version.h>
 #include <asm/dma-iommu.h>
 #include <asm/cacheflush.h>
diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
index b0754070..9fa7514a 100644
--- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/bsearch.h>
 #include <uapi/linux/nvgpu.h>
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
index b6105a40..5b888299 100644
--- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
@@ -19,7 +19,6 @@
 #include <linux/fs.h>
 #include <linux/hrtimer.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <nvgpu/lock.h>
 #include <uapi/linux/nvgpu.h>
 
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 7d9e47d6..a5dbe23d 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -15,7 +15,6 @@
 
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/vmalloc.h>
 #include <linux/version.h>
 #include <soc/tegra/fuse.h>
 
diff --git a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c
index bbdc3a51..1a6e6d7c 100644
--- a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/bsearch.h>
 #include <uapi/linux/nvgpu.h>
diff --git a/drivers/gpu/nvgpu/gp106/regops_gp106.c b/drivers/gpu/nvgpu/gp106/regops_gp106.c
index 5b6897c1..9de1d3a3 100644
--- a/drivers/gpu/nvgpu/gp106/regops_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/regops_gp106.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/bsearch.h>
 #include <uapi/linux/nvgpu.h>
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index cb6ef9c7..95590e40 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -15,7 +15,6 @@
 
 #include <linux/delay.h>
 #include <linux/version.h>
-#include <linux/vmalloc.h>
 #include <soc/tegra/fuse.h>
 
 #include <dt-bindings/soc/gm20b-fuse.h>
diff --git a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c
index a494c9b8..b880fda1 100644
--- a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/bsearch.h>
 #include <uapi/linux/nvgpu.h>
-- 
cgit v1.2.2