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

[Dmitry Chagin]

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 <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
+#include <sys/sysctl.h>
 
 #include <compat/linux/linux_emul.h>
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_util.h>
 
+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;