svn commit: r368384 - in head/sys: compat/linux conf

[Tijl Coosemans]

Author: tijl
Date: Sun Dec  6 10:58:55 2020
New Revision: 368384
URL: https://svnweb.freebsd.org/changeset/base/368384

Log:
  Move V4L feature declarations and DTrace provider definitions from
  linux_common.c to linux_util.c so they become available on i386.
  
  linux_common.c defines the linux_common kernel module but this module does
  not exist on i386 and linux_common.c is not included in the linux module.
  linux_util.c is included in the linux_common module on amd64 and the linux
  module on i386.
  
  Remove linux_common.c from files.i386 again.  It was added recently in
  r367433 when the DTrace provider definitions were moved.
  
  The V4L feature declarations were moved to linux_common in r283423.

Modified:
  head/sys/compat/linux/linux_common.c
  head/sys/compat/linux/linux_util.c
  head/sys/conf/files.i386

Modified: head/sys/compat/linux/linux_common.c
==============================================================================
--- head/sys/compat/linux/linux_common.c	Sun Dec  6 08:01:27 2020	(r368383)
+++ head/sys/compat/linux/linux_common.c	Sun Dec  6 10:58:55 2020	(r368384)
@@ -36,33 +36,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>
-#include <sys/sysctl.h>
 
 #include <compat/linux/linux.h>
-#include <compat/linux/linux_dtrace.h>
 #include <compat/linux/linux_emul.h>
 #include <compat/linux/linux_ioctl.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);
-
-/**
- * Special DTrace provider for the linuxulator.
- *
- * In this file we define the provider for the entire linuxulator. All
- * modules (= files of the linuxulator) use it.
- *
- * We define a different name depending on the emulated bitsize, see
- * ../../<ARCH>/linux{,32}/linux.h, e.g.:
- *      native bitsize          = linuxulator
- *      amd64, 32bit emulation  = linuxulator32
- */
-LIN_SDT_PROVIDER_DEFINE(linuxulator);
-LIN_SDT_PROVIDER_DEFINE(linuxulator32);
 
 SET_DECLARE(linux_device_handler_set, struct linux_device_handler);
 

Modified: head/sys/compat/linux/linux_util.c
==============================================================================
--- head/sys/compat/linux/linux_util.c	Sun Dec  6 08:01:27 2020	(r368383)
+++ head/sys/compat/linux/linux_util.c	Sun Dec  6 10:58:55 2020	(r368384)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/stdarg.h>
 
+#include <compat/linux/linux_dtrace.h>
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_util.h>
 
@@ -61,6 +62,23 @@ MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures
 MALLOC_DEFINE(M_EPOLL, "lepoll", "Linux events structures");
 MALLOC_DEFINE(M_FUTEX, "futex", "Linux futexes");
 MALLOC_DEFINE(M_FUTEX_WP, "futex wp", "Linux futex waiting proc");
+
+FEATURE(linuxulator_v4l, "V4L ioctl wrapper support in the linuxulator");
+FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support in the linuxulator");
+
+/**
+ * Special DTrace provider for the linuxulator.
+ *
+ * In this file we define the provider for the entire linuxulator. All
+ * modules (= files of the linuxulator) use it.
+ *
+ * We define a different name depending on the emulated bitsize, see
+ * ../../<ARCH>/linux{,32}/linux.h, e.g.:
+ *      native bitsize          = linuxulator
+ *      amd64, 32bit emulation  = linuxulator32
+ */
+LIN_SDT_PROVIDER_DEFINE(linuxulator);
+LIN_SDT_PROVIDER_DEFINE(linuxulator32);
 
 char linux_emul_path[MAXPATHLEN] = "/compat/linux";
 

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Sun Dec  6 08:01:27 2020	(r368383)
+++ head/sys/conf/files.i386	Sun Dec  6 10:58:55 2020	(r368384)
@@ -52,7 +52,6 @@ cddl/dev/dtrace/i386/dtrace_asm.S			optional dtrace co
 cddl/dev/dtrace/i386/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
 compat/linprocfs/linprocfs.c	optional linprocfs
 compat/linsysfs/linsysfs.c	optional linsysfs
-compat/linux/linux_common.c	optional compat_linux
 compat/linux/linux_dummy.c	optional compat_linux
 compat/linux/linux_event.c	optional compat_linux
 compat/linux/linux_emul.c	optional compat_linux