D58228.id184004.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D58228.id184004.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h
	--- a/sys/compat/linuxkpi/common/include/linux/sched.h
	+++ b/sys/compat/linuxkpi/common/include/linux/sched.h
	@@ -77,12 +77,14 @@
	atomic_t state;
	atomic_t kthread_flags;
	pid_t pid; /* BSD thread ID */
	+#if __FreeBSD_version >= 1600021
	+ pid_t tgid;
	+#endif
	const char *comm;
	void *bsd_ioctl_data;
	unsigned bsd_ioctl_len;
	struct completion parked;
	struct completion exited;
	- pid_t tgid;
	#define TS_RCU_TYPE_MAX 2
	TAILQ_ENTRY(task_struct) rcu_entry[TS_RCU_TYPE_MAX];
	int rcu_recurse[TS_RCU_TYPE_MAX];
	diff --git a/sys/sys/param.h b/sys/sys/param.h
	--- a/sys/sys/param.h
	+++ b/sys/sys/param.h
	@@ -74,7 +74,7 @@
	* cannot include sys/param.h and should only be updated here.
	*/
	#undef __FreeBSD_version
	-#define __FreeBSD_version 1600019
	+#define __FreeBSD_version 1600021

	/*
	* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,