Page MenuHomeFreeBSD
Files F102645554

D27124.diff
No OneTemporary
Actions

D27124.diff
View Options

Index: head/sys/compat/linux/linux_common.c
===================================================================
--- head/sys/compat/linux/linux_common.c
+++ head/sys/compat/linux/linux_common.c
@@ -39,6 +39,7 @@
#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>
@@ -48,6 +49,20 @@
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);
Index: head/sys/compat/linux/linux_dummy.c
===================================================================
--- head/sys/compat/linux/linux_dummy.c
+++ head/sys/compat/linux/linux_dummy.c
@@ -29,21 +29,19 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/sdt.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#ifdef COMPAT_LINUX32
-#include <machine/../linux32/linux.h>
-#include <machine/../linux32/linux32_proto.h>
-#else
+/*
+ * Including linux vs linux32 here is arbitrary -- the syscall args structures
+ * (proto.h) are not dereferenced by the DUMMY stub implementations, and
+ * suitable for use by both native and compat32 entrypoints.
+ */
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
-#endif
#include <compat/linux/linux_dtrace.h>
#include <compat/linux/linux_util.h>
Index: head/sys/compat/linux/linux_misc.c
===================================================================
--- head/sys/compat/linux/linux_misc.c
+++ head/sys/compat/linux/linux_misc.c
@@ -99,19 +99,6 @@
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_misc.h>
-/**
- * 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(LINUX_DTRACE);
-
int stclohz; /* Statistics clock frequency */
static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = {
Index: head/sys/conf/files.i386
===================================================================
--- head/sys/conf/files.i386
+++ head/sys/conf/files.i386
@@ -52,6 +52,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 7:02 AM (21 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14654898
Default Alt Text
D27124.diff (3 KB)

Event Timeline