From 0d96f4b73e0fb610ef945d365c41492f3d4ee147 Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sun, 11 Nov 2007 23:59:14 +0000
Subject: [PATCH] Warns cleanup.

---
 sys/bus/cam/scsi/scsi_targ_bh.c | 3 ++-
 sys/bus/cam/scsi/scsi_target.c  | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/bus/cam/scsi/scsi_targ_bh.c b/sys/bus/cam/scsi/scsi_targ_bh.c
index d8049dcc6d..53829287c0 100644
--- a/sys/bus/cam/scsi/scsi_targ_bh.c
+++ b/sys/bus/cam/scsi/scsi_targ_bh.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.4.2.6 2003/11/14 11:31:25 simokawa Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_targ_bh.c,v 1.13 2006/12/22 23:12:16 swildner Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_targ_bh.c,v 1.14 2007/11/11 23:59:14 pavalos Exp $
  */
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -37,6 +37,7 @@
 #include <sys/conf.h>
 #include <sys/devicestat.h>
 #include <sys/malloc.h>
+#include <sys/thread2.h>
 #include <sys/uio.h>
 
 #include "../cam.h"
diff --git a/sys/bus/cam/scsi/scsi_target.c b/sys/bus/cam/scsi/scsi_target.c
index 72d2e0ed06..1aea77fa35 100644
--- a/sys/bus/cam/scsi/scsi_target.c
+++ b/sys/bus/cam/scsi/scsi_target.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.22.2.7 2003/02/18 22:07:10 njl Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.15 2007/11/11 23:56:40 pavalos Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.16 2007/11/11 23:59:14 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -675,7 +675,6 @@ targusermerge(struct targ_softc *softc, struct targ_cmd_descr *descr,
 	if (k_ccbh->func_code == XPT_ABORT) {
 		struct ccb_abort *cab;
 		struct ccb_hdr *ccb_h;
-		int s;
 
 		cab = (struct ccb_abort *)ccb;
 		crit_enter();
-- 
2.41.0