From d801ff15dcd90da24035cff0e5975ec175991983 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 13 Nov 2020 18:34:13 +0000
Subject: [PATCH] Disable kernel INIT_ALL_ZERO on amd64

It is currently incompatible with kernel ifunc memset.

PR:		251083
MFC with:	r367577
Sponsored by:	The FreeBSD Foundation
---
 sys/conf/kern.opts.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 072b6b5c2b4..5a66849b36d 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -68,6 +68,11 @@ __DEFAULT_NO_OPTIONS = \
 # affected by KERNEL_SYMBOLS, FORMAT_EXTENSIONS, CTF and SSP.
 
 # Things that don't work based on the CPU
+.if ${MACHINE} == "amd64"
+# PR251083 conflict between INIT_ALL_ZERO and ifunc memset
+BROKEN_OPTIONS+= INIT_ALL_ZERO
+.endif
+
 .if ${MACHINE_CPUARCH} == "arm"
 . if ${MACHINE_ARCH:Marmv[67]*} == ""
 BROKEN_OPTIONS+= CDDL ZFS