From owner-svn-src-head@FreeBSD.ORG Fri May 29 05:46:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D8CF62B0; Fri, 29 May 2015 05:46:58 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) 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 C707E1144; Fri, 29 May 2015 05:46:58 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4T5kwR1021800; Fri, 29 May 2015 05:46:58 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4T5kwEB021798; Fri, 29 May 2015 05:46:58 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201505290546.t4T5kwEB021798@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Fri, 29 May 2015 05:46:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283680 - head/sys/modules X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2015 05:46:59 -0000 Author: dchagin Date: Fri May 29 05:46:58 2015 New Revision: 283680 URL: https://svnweb.freebsd.org/changeset/base/283680 Log: Move linux64 and linux_common to it's right place and make them not depend on bhyve. Submitted by: Oliver Pinter Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri May 29 05:44:56 2015 (r283679) +++ head/sys/modules/Makefile Fri May 29 05:46:58 2015 (r283680) @@ -517,6 +517,7 @@ _ixv= ixv _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux +_linux_common= linux_common .if ${MK_OFED} != "no" _linuxapi= linuxapi .endif @@ -621,6 +622,7 @@ _x86bios= x86bios .if ${MACHINE_CPUARCH} == "amd64" _ixl= ixl _ixlv= ixlv +_linux64= linux64 _ntb= ntb _qlxge= qlxge _qlxgb= qlxgb @@ -629,8 +631,6 @@ _sfxge= sfxge .if ${MK_BHYVE} != "no" || defined(ALL_MODULES) _vmm= vmm -_linux_common= linux_common -_linux64= linux64 .endif .endif