From owner-svn-src-all@FreeBSD.ORG Tue Apr 8 21:39:53 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21F2D4C8; Tue, 8 Apr 2014 21:39:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7BA51861; Tue, 8 Apr 2014 21:39:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38LdqZ8028539; Tue, 8 Apr 2014 21:39:52 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38LdqbY028535; Tue, 8 Apr 2014 21:39:52 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201404082139.s38LdqbY028535@svn.freebsd.org> From: Sean Bruno Date: Tue, 8 Apr 2014 21:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264280 - in head/sys: conf modules X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 21:39:53 -0000 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