svn commit: r335424 - stable/11/sys/compat/linuxkpi/common/include/linux

[Hans Petter Selasky]

Author: hselasky
Date: Wed Jun 20 06:48:41 2018
New Revision: 335424
URL: https://svnweb.freebsd.org/changeset/base/335424

Log:
  MFC r334714:
  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>
  Sponsored by:	Mellanox Technologies
  Sponsored by:	Limelight Networks

Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/wait.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/wait.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/wait.h	Wed Jun 20 06:47:49 2018	(r335423)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/wait.h	Wed Jun 20 06:48:41 2018	(r335424)
@@ -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 */
+	};
 };
 
 /*