svn commit: r264280 - in head/sys: conf modules

[Sean Bruno]

Author: sbruno
Date: Tue Apr  8 21:39:51 2014
New Revision: 264280
URL: http://svnweb.freebsd.org/changeset/base/264280

Log:
  Actually, since this is what I thought I was doing, only allow the
  binmisc code to be build on amd64/i386 for the kernel.
  
  Update NOTES with some indication of what this code is used for.
  
  Pointed out by jhb@ ... thanks!
  
  Submitted by:	jhb@

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

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Tue Apr  8 21:30:10 2014	(r264279)
+++ head/sys/conf/NOTES	Tue Apr  8 21:39:51 2014	(r264280)
@@ -2963,3 +2963,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/options.amd64
==============================================================================
--- head/sys/conf/options.amd64	Tue Apr  8 21:30:10 2014	(r264279)
+++ head/sys/conf/options.amd64	Tue Apr  8 21:39:51 2014	(r264280)
@@ -21,6 +21,7 @@ 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	Tue Apr  8 21:30:10 2014	(r264279)
+++ head/sys/conf/options.i386	Tue Apr  8 21:39:51 2014	(r264280)
@@ -26,6 +26,7 @@ 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/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Tue Apr  8 21:30:10 2014	(r264279)
+++ head/sys/modules/Makefile	Tue Apr  8 21:39:51 2014	(r264280)
@@ -148,7 +148,7 @@ SUBDIR=	\
 	if_vlan \
 	${_igb} \
 	${_iir} \
-	imgact_binmisc \
+	${_imgact_binmisc} \
 	${_io} \
         ${_ipoib} \
 	${_ipdivert} \
@@ -372,6 +372,7 @@ SUBDIR=	\
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _filemon=	filemon
+_imagact_binmisc=	imgact_binmisc
 _vmware=	vmware
 .endif