D60798.id190106.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D60798.id190106.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h
	--- a/sys/compat/linuxkpi/common/include/linux/io.h
	+++ b/sys/compat/linuxkpi/common/include/linux/io.h
	@@ -38,6 +38,7 @@
	#include <linux/err.h>
	#include <asm-generic/io.h>
	#include <linux/types.h>
	+#include <linux/kernel.h>
	#if !defined(__arm__)
	#include <asm/set_memory.h>
	#endif
	diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h
	--- a/sys/compat/linuxkpi/common/include/linux/mm.h
	+++ b/sys/compat/linuxkpi/common/include/linux/mm.h
	@@ -43,6 +43,7 @@
	#include <linux/shrinker.h>
	#include <linux/page.h>
	#include <linux/page-flags.h>
	+#include <linux/fs.h>

	#include <asm/pgtable.h>

	diff --git a/sys/dev/qat/include/common/qat_freebsd.h b/sys/dev/qat/include/common/qat_freebsd.h
	--- a/sys/dev/qat/include/common/qat_freebsd.h
	+++ b/sys/dev/qat/include/common/qat_freebsd.h
	@@ -25,6 +25,15 @@
	#include <asm/uaccess.h>
	#include <linux/math64.h>
	#include <linux/spinlock.h>
	+/*
	+ * `linux/device.h` redefines `file` to be `linux_file` to manage the
	+ * name conflict between the Linux and FreeBSD structures, while avoiding a
	+ * extensive rewrite and use of macros in the original drm_fb_helper.[ch]
	+ * files.
	+ *
	+ * We need to undo this here because we use FreeBSD structures.
	+ */
	+#undef file

	#define PCI_VENDOR_ID_INTEL 0x8086