svn commit: r250438 - user/dchagin/lemul/sys/compat/linux

Dmitry Chagin dchagin at FreeBSD.org
Fri May 10 06:43:42 UTC 2013


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;


More information about the svn-src-user mailing list