From 9fc89b6017df551d7ee9d8b351e6455ee4e224fb Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 30 Jul 2018 15:57:58 +0000
Subject: [PATCH] Enable VIMAGE on arm64 again. A workaround for modules with
 static VNET variables has been committed so these should work now.

PR:		223670
Sponsored by:	DARPA, AFRL
---
 sys/arm64/conf/GENERIC | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 994a8f0cef11..fac6482472e6 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -26,7 +26,7 @@ makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
-#options 	VIMAGE			# Subsystem virtualization, e.g. VNET
+options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security