svn commit: r266531 - in head/sys: amd64/conf conf i386/conf modules

[Justin Hibbits]

Author: jhibbits
Date: Thu May 22 05:04:40 2014
New Revision: 266531
URL: http://svnweb.freebsd.org/changeset/base/266531

Log:
  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

Modified:
  head/sys/amd64/conf/NOTES
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/options
  head/sys/conf/options.amd64
  head/sys/conf/options.i386
  head/sys/i386/conf/NOTES
  head/sys/modules/Makefile

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/amd64/conf/NOTES	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/NOTES	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/files	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/files.amd64	Thu May 22 05:04:40 2014	(r266531)
@@ -438,7 +438,6 @@ dev/virtio/scsi/virtio_scsi.c		optional	
 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
 #

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/files.i386	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/options	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/options.amd64	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/conf/options.i386
==============================================================================
--- head/sys/conf/options.i386	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/conf/options.i386	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/i386/conf/NOTES	Thu May 22 05:04:40 2014	(r266531)
@@ -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

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Thu May 22 04:46:51 2014	(r266530)
+++ head/sys/modules/Makefile	Thu May 22 05:04:40 2014	(r266531)
@@ -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