diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index cfc960cfcf68..9ba0e9e63ddc 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -271,7 +271,7 @@ __DEFAULT_NO_OPTIONS+=GDB_LIBEXEC
 .else
 __DEFAULT_YES_OPTIONS+=GDB_LIBEXEC
 .endif
-# Only doing soft float API stuff on armv6
+# Only doing soft float API stuff on armv6 and armv7
 .if ${__T} != "armv6" && ${__T} != "armv7"
 BROKEN_OPTIONS+=LIBSOFT
 .endif
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index d7cbf64c09c7..08385514d5d4 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -137,7 +137,7 @@ __FBSDID("$FreeBSD$");
 #define	WITNESS_COUNT 		1536
 #endif
 #define	WITNESS_HASH_SIZE	251	/* Prime, gives load factor < 2 */
-#define	WITNESS_PENDLIST	(1024 + MAXCPU)
+#define	WITNESS_PENDLIST	(2048 + MAXCPU)
 
 /* Allocate 256 KB of stack data space */
 #define	WITNESS_LO_DATA_COUNT	2048