test/gem_userptr_*: Fix compile fail

Also shut up warnings. Those revealed incorrect usage of local
variables in conjunction with igt_fixture/igt_subtest. Since those use
longjmps we need to move the out of the stackframe those magic blocks
are declared in.

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

1 files changed, 7 insertions, 5 deletions

diff --git a/benchmarks/gem_userptr_benchmark.c b/benchmarks/gem_userptr_benchmark.c
index 9ad6e4a3..bdfce126 100644
--- a/benchmarks/gem_userptr_benchmark.c
+++ b/benchmarks/gem_userptr_benchmark.c
@@ -42,8 +42,11 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/mman.h>
+#include <signal.h>
+
 #include "drm.h"
 #include "i915_drm.h"
+
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
@@ -288,7 +291,6 @@ static void test_ptr_read(void *ptr)
 	unsigned long iter = 0;
 	volatile unsigned long *p;
 	unsigned long i, loops;
-	register unsigned long v;
 
 	loops = BO_SIZE / sizeof(unsigned long) / 4;
 
@@ -297,10 +299,10 @@ static void test_ptr_read(void *ptr)
 	while (run_test) {
 		p = (unsigned long *)ptr;
 		for (i = 0; i < loops; i++) {
-			v = *p++;
-			v = *p++;
-			v = *p++;
-			v = *p++;
+			(void)*p++;
+			(void)*p++;
+			(void)*p++;
+			(void)*p++;
 		}
 		iter++;
 	}