avoid bypassing sys/queue.h in many places in the kernel.

many assumptions were made about the way the various list types are
implemented.

lots of suggestions and help from otto and miod.
ok otto@

2 files changed, 6 insertions, 4 deletions

diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c
index 177a690d33b..1d96a9f776e 100644
--- a/sys/arch/mvme68k/dev/sbic.c
+++ b/sys/arch/mvme68k/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.17 2005/12/03 18:09:37 krw Exp $ */
+/*	$OpenBSD: sbic.c,v 1.18 2007/05/28 22:17:21 pyr Exp $ */
 /*	$NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $	*/
 
 /*
@@ -57,6 +57,7 @@
 #include <sys/disklabel.h>
 #include <sys/dkstat.h>
 #include <sys/buf.h>
+#include <sys/queue.h>
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 #include <uvm/uvm_extern.h>
@@ -643,7 +644,7 @@ sbic_scsidone(acb, stat)
             dosched = 1;    /* start next command */
 
     } else
-    if ( dev->ready_list.tqh_last == &acb->chain.tqe_next ) {
+    if (TAILQ_LAST(&dev->ready_list) == TAILQ_NEXT(acb, chain)) {
 
         TAILQ_REMOVE(&dev->ready_list, acb, chain);
 
diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c
index 814f3d150d1..a92aae8a528 100644
--- a/sys/arch/mvme68k/dev/ssh.c
+++ b/sys/arch/mvme68k/dev/ssh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh.c,v 1.14 2005/12/03 18:09:37 krw Exp $ */
+/*	$OpenBSD: ssh.c,v 1.15 2007/05/28 22:17:21 pyr Exp $ */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -46,6 +46,7 @@
 #include <sys/dkstat.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
+#include <sys/queue.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
@@ -391,7 +392,7 @@ ssh_scsidone(acb, stat)
 			dosched = 1;	/* start next command */
 		--sc->sc_active;
 		SSH_TRACE('d','a',stat,0)
-	} else if (sc->ready_list.tqh_last == &acb->chain.tqe_next) {
+	} else if (TAILQ_LAST(&sc->ready_list)  == TAILQ_NEXT(acb, chain)) {
 		TAILQ_REMOVE(&sc->ready_list, acb, chain);
 		SSH_TRACE('d','r',stat,0)
 	} else {