X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/osfmk/kern/queue.h

diff --git a/osfmk/kern/queue.h b/osfmk/kern/queue.h
index ca0f91eaf..d0bab0c61 100644
--- a/osfmk/kern/queue.h
+++ b/osfmk/kern/queue.h
@@ -146,7 +146,7 @@ extern void		insque(
 				queue_entry_t	pred);
 
 /* Dequeue element */
-extern int		remque(
+extern void		remque(
 				queue_entry_t elt);
 
 __END_DECLS
@@ -225,14 +225,12 @@ insque(
 	pred->next = entry;
 }
 
-static __inline__ integer_t
+static __inline__ void
 remque(
 	register queue_entry_t elt)
 {
 	(elt->next)->prev = elt->prev;
 	(elt->prev)->next = elt->next;
-
-	return((integer_t)elt);
 }
 
 #endif	/* !__GNUC__ */
@@ -488,6 +486,9 @@ MACRO_BEGIN							\
 		(head)->next = __next;				\
 	else							\
 		((type)__prev)->field.next = __next;		\
+								\
+	(elt)->field.next = NULL;				\
+	(elt)->field.prev = NULL;				\
 MACRO_END
 
 /*
@@ -511,6 +512,9 @@ MACRO_BEGIN							\
 	else							\
 		((type)(__next))->field.prev = (head);		\
 	(head)->next = __next;					\
+								\
+	(entry)->field.next = NULL;				\
+	(entry)->field.prev = NULL;				\
 MACRO_END
 
 /*
@@ -534,6 +538,9 @@ MACRO_BEGIN							\
 	else							\
 		((type)(__prev))->field.next = (head);		\
 	(head)->prev = __prev;					\
+								\
+	(entry)->field.next = NULL;				\
+	(entry)->field.prev = NULL;				\
 MACRO_END
 
 /*