Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh
+++ sys/conf/newvers.sh
@@ -63,7 +63,7 @@
 
 	savedir=$(pwd)
 	cd ${SYSDIR}/..
-	while [ $(pwd) != "/" ]; do
+	while [ $(pwd) != "/usr" ]; do
 		if [ -e "./$1" ]; then
 			VCSTOP=$(pwd)
 			VCSDIR=${VCSTOP}"/$1"
Index: sys/i386/conf/GENERIC
===================================================================
--- sys/i386/conf/GENERIC
+++ sys/i386/conf/GENERIC
@@ -89,12 +89,12 @@
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
 options 	DEADLKRES		# Enable the deadlock resolver
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-options 	VERBOSE_SYSINIT=0	# Support debug.verbose_sysinit, off by default
+#options 	INVARIANTS		# Enable calls of extra sanity checking
+#options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+#options 	WITNESS			# Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+#options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
+#options 	VERBOSE_SYSINIT=0	# Support debug.verbose_sysinit, off by default
 
 # Kernel dump features.
 options 	EKCD			# Support for encrypted kernel dumps
Index: sys/opencrypto/cryptodeflate.c
===================================================================
--- sys/opencrypto/cryptodeflate.c
+++ sys/opencrypto/cryptodeflate.c
@@ -50,10 +50,10 @@
 SDT_PROVIDER_DECLARE(opencrypto);
 SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry,
     "int", "u_int32_t");
-SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, bad,
-    "int", "int", "int", "int", "int");
-SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, iter,
-    "int", "int", "int", "int", "int");
+SDT_PROBE_DEFINE6(opencrypto, deflate, deflate_global, bad,
+    "int", "int", "int", "int", "int", "int");
+SDT_PROBE_DEFINE6(opencrypto, deflate, deflate_global, iter,
+    "int", "int", "int", "int", "int", "int");
 SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, return,
     "int", "u_int32_t");
 
@@ -105,8 +105,8 @@
 	bufh = bufp = malloc(sizeof(*bufp) + (size_t)(size * i),
 	    M_CRYPTO_DATA, M_NOWAIT);
 	if (bufp == NULL) {
-		SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
-		    decomp, 0, __LINE__, 0, 0);
+		SDT_PROBE6(opencrypto, deflate, deflate_global, bad,
+		    decomp, 0, __LINE__, 0, 0, 0);
 		goto bad2;
 	}
 	bufp->next = NULL;
@@ -125,8 +125,8 @@
 	    deflateInit2(&zbuf, Z_DEFAULT_COMPRESSION, Z_METHOD,
 		    window_deflate, Z_MEMLEVEL, Z_DEFAULT_STRATEGY);
 	if (error != Z_OK) {
-		SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
-		    decomp, error, __LINE__, 0, 0);
+		SDT_PROBE6(opencrypto, deflate, deflate_global, bad,
+		    decomp, error, __LINE__, 0, 0, 0);
 		goto bad;
 	}
 
@@ -134,24 +134,14 @@
 		error = decomp ? inflate(&zbuf, Z_SYNC_FLUSH) :
 				 deflate(&zbuf, Z_FINISH);
 		if (error != Z_OK && error != Z_STREAM_END) {
-			/*
-			 * Unfortunately we are limited to 5 arguments,
-			 * thus use two probes.
-			 */
-			SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
+			SDT_PROBE6(opencrypto, deflate, deflate_global, bad,
 			    decomp, error, __LINE__,
-			    zbuf.avail_in, zbuf.avail_out);
-			SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
-			    decomp, error, __LINE__,
-			    zbuf.state->dummy, zbuf.total_out);
+			    zbuf.avail_in, zbuf.avail_out, zbuf.total_out);
 			goto bad;
 		}
-		SDT_PROBE5(opencrypto, deflate, deflate_global, iter,
+		SDT_PROBE6(opencrypto, deflate, deflate_global, iter,
 		    decomp, error, __LINE__,
-		    zbuf.avail_in, zbuf.avail_out);
-		SDT_PROBE5(opencrypto, deflate, deflate_global, iter,
-		    decomp, error, __LINE__,
-		    zbuf.state->dummy, zbuf.total_out);
+		    zbuf.avail_in, zbuf.avail_out, zbuf.total_out);
 		if (decomp && zbuf.avail_in == 0 && error == Z_STREAM_END) {
 			/* Done. */
 			break;
@@ -165,8 +155,8 @@
 			p = malloc(sizeof(*p) + (size_t)(size * i),
 			    M_CRYPTO_DATA, M_NOWAIT);
 			if (p == NULL) {
-				SDT_PROBE5(opencrypto, deflate, deflate_global,
-				    bad, decomp, 0, __LINE__, 0, 0);
+				SDT_PROBE6(opencrypto, deflate, deflate_global,
+				    bad, decomp, 0, __LINE__, 0, 0, 0);
 				goto bad;
 			}
 			p->next = NULL;
@@ -177,16 +167,9 @@
 			zbuf.avail_out = bufp->size;
 		} else {
 			/* Unexpect result. */
-			/*
-			 * Unfortunately we are limited to 5 arguments,
-			 * thus, again, use two probes.
-			 */
-			SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
+			SDT_PROBE6(opencrypto, deflate, deflate_global, bad,
 			    decomp, error, __LINE__,
-			    zbuf.avail_in, zbuf.avail_out);
-			SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
-			    decomp, error, __LINE__,
-			    zbuf.state->dummy, zbuf.total_out);
+			    zbuf.avail_in, zbuf.avail_out, zbuf.total_out);
 			goto bad;
 		}
 	}
@@ -195,8 +178,8 @@
 
 	*out = malloc(result, M_CRYPTO_DATA, M_NOWAIT);
 	if (*out == NULL) {
-		SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
-		    decomp, 0, __LINE__, 0, 0);
+		SDT_PROBE6(opencrypto, deflate, deflate_global, bad,
+		    decomp, 0, __LINE__, 0, 0, 0);
 		goto bad;
 	}
 	if (decomp)