From owner-svn-src-user@FreeBSD.ORG  Fri May 10 06:43:42 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 40041E42;
 Fri, 10 May 2013 06:43:42 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 33ADD18F;
 Fri, 10 May 2013 06:43:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4A6hgxr043804;
 Fri, 10 May 2013 06:43:42 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4A6hgLF043803;
 Fri, 10 May 2013 06:43:42 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201305100643.r4A6hgLF043803@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Fri, 10 May 2013 06:43:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r250438 - 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.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 May 2013 06:43:42 -0000

Author: dchagin
Date: Fri May 10 06:43:41 2013
New Revision: 250438
URL: http://svnweb.freebsd.org/changeset/base/250438

Log:
  Get ready to commit x86_64 Linux emulation.
  Add FEATURE macros for v4l and v4l2 for the 64-bit Linuxulator.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_ioctl.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_ioctl.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_ioctl.c	Fri May 10 06:42:06 2013	(r250437)
+++ user/dchagin/lemul/sys/compat/linux/linux_ioctl.c	Fri May 10 06:43:41 2013	(r250438)
@@ -93,8 +93,13 @@ __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;