From owner-svn-src-user@FreeBSD.ORG Fri Nov 7 06:11:55 2014 Return-Path: Delivered-To: svn-src-user@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 7F16DB10; Fri, 7 Nov 2014 06:11:55 +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 51E75DB0; Fri, 7 Nov 2014 06:11:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA76BtQq031039; Fri, 7 Nov 2014 06:11:55 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA76BsEe031036; Fri, 7 Nov 2014 06:11:54 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201411070611.sA76BsEe031036@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Fri, 7 Nov 2014 06:11:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r274220 - user/dchagin/lemul/sys/compat/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 06:11:55 -0000 Author: dchagin Date: Fri Nov 7 06:11:54 2014 New Revision: 274220 URL: https://svnweb.freebsd.org/changeset/base/274220 Log: Move FEATURE macros for v4l and v4l2 to the common module. Modified: user/dchagin/lemul/sys/compat/linux/linux_common.c user/dchagin/lemul/sys/compat/linux/linux_ioctl.c Modified: user/dchagin/lemul/sys/compat/linux/linux_common.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_common.c Fri Nov 7 06:08:32 2014 (r274219) +++ user/dchagin/lemul/sys/compat/linux/linux_common.c Fri Nov 7 06:11:54 2014 (r274220) @@ -35,11 +35,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +FEATURE(linuxulator_v4l, "V4L ioctl wrapper support in the linuxulator"); +FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support in the linuxulator"); + MODULE_VERSION(linux_common, 1); SET_DECLARE(linux_device_handler_set, struct linux_device_handler); Modified: user/dchagin/lemul/sys/compat/linux/linux_ioctl.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_ioctl.c Fri Nov 7 06:08:32 2014 (r274219) +++ user/dchagin/lemul/sys/compat/linux/linux_ioctl.c Fri Nov 7 06:11:54 2014 (r274220) @@ -95,14 +95,6 @@ __FBSDID("$FreeBSD$"); CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); -#if defined(__amd64__) && !defined(COMPAT_LINUX32) -FEATURE(linuxulator64_v4l, "V4L ioctl wrapper support in the 64-bit linuxulator"); -FEATURE(linuxulator64_v4l2, "V4L2 ioctl wrapper support in the 64-bit linuxulator"); -#else -FEATURE(linuxulator_v4l, "V4L ioctl wrapper support in the linuxulator"); -FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support in the linuxulator"); -#endif - static linux_ioctl_function_t linux_ioctl_cdrom; static linux_ioctl_function_t linux_ioctl_vfat; static linux_ioctl_function_t linux_ioctl_console;