[Midnightbsd-cvs] src [12357] trunk/sys/sys: sync with FreeBSD 11-stable

[laffer1 at midnightbsd.org]

Revision: 12357
          http://svnweb.midnightbsd.org/src/?rev=12357
Author:   laffer1
Date:     2020-02-09 12:52:06 -0500 (Sun, 09 Feb 2020)
Log Message:
-----------
sync with FreeBSD 11-stable

Modified Paths:
--------------
    trunk/sys/sys/sleepqueue.h
    trunk/sys/sys/slicer.h

Modified: trunk/sys/sys/sleepqueue.h
===================================================================
--- trunk/sys/sys/sleepqueue.h	2020-02-09 17:51:38 UTC (rev 12356)
+++ trunk/sys/sys/sleepqueue.h	2020-02-09 17:52:06 UTC (rev 12357)
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: stable/10/sys/sys/sleepqueue.h 274139 2014-11-05 16:24:57Z lwhsu $
+ * $FreeBSD: stable/11/sys/sys/sleepqueue.h 354405 2019-11-06 18:02:18Z mav $
  */
 
 #ifndef _SYS_SLEEPQUEUE_H_
@@ -84,6 +84,7 @@
 #define	SLEEPQ_SX		0x03		/* Used by an sx lock. */
 #define	SLEEPQ_LK		0x04		/* Used by a lockmgr. */
 #define	SLEEPQ_INTERRUPTIBLE	0x100		/* Sleep is interruptible. */
+#define	SLEEPQ_UNFAIR		0x200		/* Unfair wakeup order. */
 
 void	init_sleepqueues(void);
 int	sleepq_abort(struct thread *td, int intrval);
@@ -91,11 +92,14 @@
 	    int flags, int queue);
 struct sleepqueue *sleepq_alloc(void);
 int	sleepq_broadcast(void *wchan, int flags, int pri, int queue);
+void	sleepq_chains_remove_matching(bool (*matches)(struct thread *));
 void	sleepq_free(struct sleepqueue *sq);
 void	sleepq_lock(void *wchan);
 struct sleepqueue *sleepq_lookup(void *wchan);
 void	sleepq_release(void *wchan);
 void	sleepq_remove(struct thread *td, void *wchan);
+int	sleepq_remove_matching(struct sleepqueue *sq, int queue,
+	    bool (*matches)(struct thread *), int pri);
 int	sleepq_signal(void *wchan, int flags, int pri, int queue);
 void	sleepq_set_timeout_sbt(void *wchan, sbintime_t sbt,
 	    sbintime_t pr, int flags);
@@ -108,5 +112,11 @@
 void	sleepq_wait(void *wchan, int pri);
 int	sleepq_wait_sig(void *wchan, int pri);
 
+#ifdef STACK
+struct sbuf;
+int sleepq_sbuf_print_stacks(struct sbuf *sb, void *wchan, int queue,
+    int *count_stacks_printed);
+#endif
+
 #endif	/* _KERNEL */
 #endif	/* !_SYS_SLEEPQUEUE_H_ */

Modified: trunk/sys/sys/slicer.h
===================================================================
--- trunk/sys/sys/slicer.h	2020-02-09 17:51:38 UTC (rev 12356)
+++ trunk/sys/sys/slicer.h	2020-02-09 17:52:06 UTC (rev 12357)
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: stable/10/sys/sys/slicer.h 318159 2017-05-10 21:42:16Z marius $
+ * $FreeBSD: stable/11/sys/sys/slicer.h 346557 2019-04-22 15:04:11Z ian $
  */
 
 #ifndef _FLASH_SLICER_H_
@@ -57,7 +57,7 @@
 #define	FLASH_SLICES_TYPE_SPI		2
 #define	FLASH_SLICES_TYPE_MMC		3
 
-/* Use NULL for deregistering a slicer */
+/* Use NULL and set force to true for deregistering a slicer */
 void flash_register_slicer(flash_slicer_t slicer, u_int type, bool force);
 
 #endif /* _KERNEL */