reduced excessive timeouts for paging tests and upped #cpus to 8

src/tests/vm/Make.tests

@@ -90,11 +90,15 @@ tests/vm/mmap-over-data_PUTFILES = tests/vm/sample.txt
 tests/vm/mmap-over-stk_PUTFILES = tests/vm/sample.txt
 tests/vm/mmap-remove_PUTFILES = tests/vm/sample.txt
 
-tests/vm/page-linear.output: TIMEOUT = 300
-tests/vm/page-shuffle.output: TIMEOUT = 600
-tests/vm/mmap-shuffle.output: TIMEOUT = 600
-tests/vm/page-merge-seq.output: TIMEOUT = 600
-tests/vm/page-merge-par.output: TIMEOUT = 600
+tests/vm/page-linear.output: TIMEOUT = 30
+tests/vm/page-shuffle.output: TIMEOUT = 60
+tests/vm/mmap-shuffle.output: TIMEOUT = 60
+tests/vm/page-merge-seq.output: TIMEOUT = 60
+tests/vm/page-merge-par.output: TIMEOUT = 60
+tests/vm/page-merge-seq.output: SMP = 8
+tests/vm/page-merge-par.output: SMP = 8
+tests/vm/page-merge-mm.output: SMP = 8
+tests/vm/page-merge-stk.output: SMP = 8
 
 tests/vm/zeros:
 	dd if=/dev/zero of=$@ bs=1024 count=6