From 81e3caaf77a628c23110f419dcaa064b768435db Mon Sep 17 00:00:00 2001
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Thu, 22 May 2014 05:04:40 +0000
Subject: [PATCH] imagact_binmisc builds for all supported architectures, so
 enable it for all.

Any bugs in execution will be dealt with as they crop up.

MFC after:	3 weeks
Relnotes:	Yes
---
 sys/amd64/conf/NOTES   | 3 ---
 sys/conf/NOTES         | 3 +++
 sys/conf/files         | 1 +
 sys/conf/files.amd64   | 1 -
 sys/conf/files.i386    | 1 -
 sys/conf/options       | 1 +
 sys/conf/options.amd64 | 1 -
 sys/conf/options.i386  | 1 -
 sys/i386/conf/NOTES    | 3 ---
 sys/modules/Makefile   | 3 +--
 10 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 61372f5342bb..e26c730d8fa9 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -646,6 +646,3 @@ options 	VM_KMEM_SIZE_SCALE
 # Enable NDIS binary driver support
 options 	NDISAPI
 device		ndis
-
-# Module to enable execution of application via emulators like QEMU
-options         IMAGACT_BINMISC
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c834e2878e62..f88411e510c0 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2968,3 +2968,6 @@ options 	RANDOM_YARROW	# Yarrow RNG
 ##options 	RANDOM_FORTUNA	# Fortuna RNG - not yet implemented
 options 	RANDOM_DEBUG	# Debugging messages
 options 	RANDOM_RWFILE	# Read and write entropy cache
+
+# Module to enable execution of application via emulators like QEMU
+options         IMAGACT_BINMISC
diff --git a/sys/conf/files b/sys/conf/files
index 4c82f9bf746f..c7d850c49583 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2850,6 +2850,7 @@ kern/bus_if.m			standard
 kern/clock_if.m			standard
 kern/cpufreq_if.m		standard
 kern/device_if.m		standard
+kern/imgact_binmisc.c		optional	imagact_binmisc
 kern/imgact_elf.c		standard
 kern/imgact_elf32.c		optional compat_freebsd32
 kern/imgact_shell.c		standard
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index e7d33a800f1c..6eefb4c816df 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -438,7 +438,6 @@ dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi
 dev/virtio/random/virtio_random.c	optional	virtio_random
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
-kern/imgact_binmisc.c		optional	imagact_binmisc
 kern/kern_clocksource.c		standard
 kern/link_elf_obj.c		standard
 #
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index b07eebdfd2fa..ae0238251d5e 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -520,7 +520,6 @@ isa/syscons_isa.c		optional sc
 isa/vga_isa.c			optional vga
 kern/kern_clocksource.c		standard
 kern/imgact_aout.c		optional compat_aout
-kern/imgact_binmisc.c		optional imagact_binmisc
 kern/imgact_gzip.c		optional gzip
 libkern/divdi3.c		standard
 libkern/flsll.c			standard
diff --git a/sys/conf/options b/sys/conf/options
index fdc3530ab761..f181dde3584e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -91,6 +91,7 @@ DIRECTIO
 FILEMON		opt_dontuse.h
 FFCLOCK
 FULL_PREEMPTION	opt_sched.h
+IMAGACT_BINMISC		opt_dontuse.h
 IPI_PREEMPTION	opt_sched.h
 GEOM_AES	opt_geom.h
 GEOM_BDE	opt_geom.h
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index b23c5cd3f77c..f1d4b4a57e48 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -21,7 +21,6 @@ COMPAT_FREEBSD32	opt_compat.h
 COMPAT_LINUX32		opt_compat.h
 #COMPAT_SVR4		opt_dontuse.h
 #DEBUG_SVR4		opt_svr4.h
-IMAGACT_BINMISC		opt_dontuse.h
 LINPROCFS		opt_dontuse.h
 LINSYSFS		opt_dontuse.h
 NDISAPI			opt_dontuse.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 7e64a802976c..3638266b13f9 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -26,7 +26,6 @@ IBCS2			opt_dontuse.h
 COMPAT_LINUX		opt_dontuse.h
 COMPAT_SVR4		opt_dontuse.h
 DEBUG_SVR4		opt_svr4.h
-IMAGACT_BINMISC		opt_binmisc.h
 LINPROCFS		opt_dontuse.h
 LINSYSFS		opt_dontuse.h
 NDISAPI			opt_dontuse.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 6ce701c432f9..2642ec033d15 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1056,6 +1056,3 @@ options 	VM_KMEM_SIZE_SCALE
 # asr old ioctls support, needed by raidutils
 
 options 	ASR_COMPAT
-
-# Module to enable execution of application via emulators like QEMU
-options         IMAGACT_BINMISC
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 3d1713f69ee1..330c68622f5a 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -150,7 +150,7 @@ SUBDIR=	\
 	if_vlan \
 	${_igb} \
 	${_iir} \
-	${_imgact_binmisc} \
+	imgact_binmisc \
 	${_io} \
         ${_ipoib} \
 	${_ipdivert} \
@@ -377,7 +377,6 @@ SUBDIR=	\
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _filemon=	filemon
-_imgact_binmisc=	imgact_binmisc
 _vmware=	vmware
 .endif