lib/drmtest: include sys/mman.h from drmtest.h

We need it for mmapping to get at PROT_READ|WRITE anyway.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

35 files changed, 1 insertions, 34 deletions

diff --git a/lib/drmtest.h b/lib/drmtest.h
index bf947dfd..3d1c323c 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -36,6 +36,7 @@
 #include <stdbool.h>
 #include <cairo.h>
 #include <setjmp.h>
+#include <sys/mman.h>
 
 #include "xf86drm.h"
 #include "xf86drmMode.h"
diff --git a/tests/gem_bad_length.c b/tests/gem_bad_length.c
index 940dffdb..72f0fe31 100644
--- a/tests/gem_bad_length.c
+++ b/tests/gem_bad_length.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_cs_tlb.c b/tests/gem_cs_tlb.c
index 45e8b724..870821b5 100644
--- a/tests/gem_cs_tlb.c
+++ b/tests/gem_cs_tlb.c
@@ -45,7 +45,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_ctx_bad_exec.c b/tests/gem_ctx_bad_exec.c
index 68b74af2..f0f49c1f 100644
--- a/tests/gem_ctx_bad_exec.c
+++ b/tests/gem_ctx_bad_exec.c
@@ -40,7 +40,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c
index 7b5be567..5f2c59f4 100644
--- a/tests/gem_ctx_exec.c
+++ b/tests/gem_ctx_exec.c
@@ -39,7 +39,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_evict_alignment.c b/tests/gem_evict_alignment.c
index 83ce5be7..af0cbbf4 100644
--- a/tests/gem_evict_alignment.c
+++ b/tests/gem_evict_alignment.c
@@ -40,7 +40,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_evict_everything.c b/tests/gem_evict_everything.c
index 63b2d464..86b0b6fe 100644
--- a/tests/gem_evict_everything.c
+++ b/tests/gem_evict_everything.c
@@ -40,7 +40,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_exec_big.c b/tests/gem_exec_big.c
index 4b3113ae..7bd6a9f4 100644
--- a/tests/gem_exec_big.c
+++ b/tests/gem_exec_big.c
@@ -42,7 +42,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c
index cbaa78b0..60facf37 100644
--- a/tests/gem_exec_blt.c
+++ b/tests/gem_exec_blt.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_exec_faulting_reloc.c b/tests/gem_exec_faulting_reloc.c
index 73b8f6d2..d25bd5ef 100644
--- a/tests/gem_exec_faulting_reloc.c
+++ b/tests/gem_exec_faulting_reloc.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index 26bb359b..be5f2c58 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_fence_thrash.c b/tests/gem_fence_thrash.c
index a5e96795..8c963afe 100644
--- a/tests/gem_fence_thrash.c
+++ b/tests/gem_fence_thrash.c
@@ -39,7 +39,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <pthread.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_gtt_cpu_tlb.c b/tests/gem_gtt_cpu_tlb.c
index 4c62ea34..bdae4f86 100644
--- a/tests/gem_gtt_cpu_tlb.c
+++ b/tests/gem_gtt_cpu_tlb.c
@@ -39,7 +39,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_gtt_speed.c b/tests/gem_gtt_speed.c
index d685838f..459bdab5 100644
--- a/tests/gem_gtt_speed.c
+++ b/tests/gem_gtt_speed.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
index 939fd4c8..9c3391e4 100644
--- a/tests/gem_mmap.c
+++ b/tests/gem_mmap.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c
index ed040484..79e34e2e 100644
--- a/tests/gem_mmap_gtt.c
+++ b/tests/gem_mmap_gtt.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_mmap_offset_exhaustion.c b/tests/gem_mmap_offset_exhaustion.c
index 1ec3299f..d834fda4 100644
--- a/tests/gem_mmap_offset_exhaustion.c
+++ b/tests/gem_mmap_offset_exhaustion.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_pread.c b/tests/gem_pread.c
index ea789ebd..d1baf541 100644
--- a/tests/gem_pread.c
+++ b/tests/gem_pread.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c
index 5ea7d169..d04535b9 100644
--- a/tests/gem_pwrite.c
+++ b/tests/gem_pwrite.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c
index 852b16c6..42c3391a 100644
--- a/tests/gem_pwrite_pread.c
+++ b/tests/gem_pwrite_pread.c
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gem_reloc_overflow.c b/tests/gem_reloc_overflow.c
index f91fc917..ff2e2f58 100644
--- a/tests/gem_reloc_overflow.c
+++ b/tests/gem_reloc_overflow.c
@@ -36,7 +36,6 @@
 #include <malloc.h>
 #include <limits.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/tests/gem_set_tiling_vs_gtt.c b/tests/gem_set_tiling_vs_gtt.c
index a620c997..ac3be7d2 100644
--- a/tests/gem_set_tiling_vs_gtt.c
+++ b/tests/gem_set_tiling_vs_gtt.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_set_tiling_vs_pwrite.c b/tests/gem_set_tiling_vs_pwrite.c
index f27accd7..fb3c7eea 100644
--- a/tests/gem_set_tiling_vs_pwrite.c
+++ b/tests/gem_set_tiling_vs_pwrite.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_suspend.c b/tests/gem_suspend.c
index de3f51c4..eea4cfce 100644
--- a/tests/gem_suspend.c
+++ b/tests/gem_suspend.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_tiled_pread.c b/tests/gem_tiled_pread.c
index 9abdb884..f3760938 100644
--- a/tests/gem_tiled_pread.c
+++ b/tests/gem_tiled_pread.c
@@ -44,7 +44,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_tiled_pread_pwrite.c b/tests/gem_tiled_pread_pwrite.c
index f92897e6..3a0817c5 100644
--- a/tests/gem_tiled_pread_pwrite.c
+++ b/tests/gem_tiled_pread_pwrite.c
@@ -53,7 +53,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c
index 89b9c945..ab76fe1d 100644
--- a/tests/gem_tiled_swapping.c
+++ b/tests/gem_tiled_swapping.c
@@ -53,7 +53,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gem_tiling_max_stride.c b/tests/gem_tiling_max_stride.c
index 28e94bc6..a00eb187 100644
--- a/tests/gem_tiling_max_stride.c
+++ b/tests/gem_tiling_max_stride.c
@@ -35,7 +35,6 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
index 4aec5229..1f91df65 100644
--- a/tests/gen3_mixed_blits.c
+++ b/tests/gen3_mixed_blits.c
@@ -41,7 +41,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c
index 343fe99c..b3e25daf 100644
--- a/tests/gen3_render_mixed_blits.c
+++ b/tests/gen3_render_mixed_blits.c
@@ -41,7 +41,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c
index e5841814..3db8f0c1 100644
--- a/tests/gen3_render_tiledx_blits.c
+++ b/tests/gen3_render_tiledx_blits.c
@@ -41,7 +41,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c
index 993b3c27..37a4d1a4 100644
--- a/tests/gen3_render_tiledy_blits.c
+++ b/tests/gen3_render_tiledy_blits.c
@@ -41,7 +41,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include "drm.h"
 #include "i915_drm.h"
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 5103bf76..8b972bb7 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <sys/poll.h>
 #include <sys/time.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>
 
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c
index 32b9aa71..481a809e 100644
--- a/tests/prime_self_import.c
+++ b/tests/prime_self_import.c
@@ -40,7 +40,6 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <pthread.h>
 
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 34133597..6c39b68b 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -56,7 +56,6 @@
 #include <unistd.h>
 #include <sys/poll.h>
 #include <sys/time.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 
 #include "i915_drm.h"