svn commit: r334714 - head/sys/compat/linuxkpi/common/include/linux

Hans Petter Selasky hselasky at FreeBSD.org
Wed Jun 6 15:06:22 UTC 2018


Author: hselasky
Date: Wed Jun  6 15:06:21 2018
New Revision: 334714
URL: https://svnweb.freebsd.org/changeset/base/334714

Log:
  Rename two structure field members while keeping backwards compatibility in
  the LinuxKPI. Add a comment saying in which Linux version this change was made.
  
  Submitted by:	Johannes Lundberg <johalun0 at gmail.com>
  MFC after:	1 week
  Sponsored by:	Mellanox Technologies
  Sponsored by:	Limelight Networks

Modified:
  head/sys/compat/linuxkpi/common/include/linux/wait.h

Modified: head/sys/compat/linuxkpi/common/include/linux/wait.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/wait.h	Wed Jun  6 14:59:23 2018	(r334713)
+++ head/sys/compat/linuxkpi/common/include/linux/wait.h	Wed Jun  6 15:06:21 2018	(r334714)
@@ -63,12 +63,18 @@ struct wait_queue {
 	unsigned int flags;	/* always 0 */
 	void *private;
 	wait_queue_func_t *func;
-	struct list_head task_list;
+	union {
+		struct list_head task_list; /* < v4.13 */
+		struct list_head entry; /* >= v4.13 */
+	};
 };
 
 struct wait_queue_head {
 	spinlock_t lock;
-	struct list_head task_list;
+	union {
+		struct list_head task_list; /* < v4.13 */
+		struct list_head head; /* >= v4.13 */
+	};
 };
 
 /*


More information about the svn-src-all mailing list