From 5132933a085213d1a981f415639e1c03b91f1613 Mon Sep 17 00:00:00 2001
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 23 Oct 2017 01:00:35 +0000
Subject: [PATCH 1/2] Bump WITNESS_PENDLIST to accomodate sleepq chain bump.

Reported by:	ngie
---
 sys/kern/subr_witness.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 0c095a65a1a58718bfa9863f3e10f49446521820 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Mon, 23 Oct 2017 07:56:56 +0000
Subject: [PATCH 2/2] Fix an omission in a comment

Soft float API support applies to armv7 too after r324340
---
 share/mk/src.opts.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 7f2087281a59..934f4a251b2c 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