4 files changed, 14 insertions, 10 deletions

diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c
index 80b26a0d6280..63ddb13a9f03 100644
--- a/sys/dev/mpt/mpt.c
+++ b/sys/dev/mpt/mpt.c
@@ -486,8 +486,8 @@ mpt_default_reply_handler(struct mpt_softc *mpt, request_t *req,
 {
 
 	mpt_prt(mpt,
-	    "Default Handler Called: req=%p:%u reply_descriptor=%x frame=%p\n",
-	    req, req->serno, reply_desc, reply_frame);
+	    "Default Handler Called: req=%u:%u reply_descriptor=%x frame=%p\n",
+	    req->index, req->serno, reply_desc, reply_frame);
 
 	if (reply_frame != NULL)
 		mpt_dump_reply_frame(mpt, reply_frame);
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index 490add7bc599..35efdd1474d6 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -1246,7 +1246,8 @@ mpt_timeout(void *arg)
 
 	MPT_LOCK_ASSERT(mpt);
 	req = ccb->ccb_h.ccb_req_ptr;
-	mpt_prt(mpt, "request %p:%u timed out for ccb %p (req->ccb %p)\n", req,
+	mpt_lprt(mpt, MPT_PRT_DEBUG,
+	"request %p:%u timed out for ccb %p (req->ccb %p)\n", req,
 	    req->serno, ccb, req->ccb);
 /* XXX: WHAT ARE WE TRYING TO DO HERE? */
 	if ((req->state & REQ_STATE_QUEUED) == REQ_STATE_QUEUED) {
@@ -2571,7 +2572,8 @@ mpt_scsi_reply_handler(struct mpt_softc *mpt, request_t *req,
 	scsi_req = (MSG_SCSI_IO_REQUEST *)req->req_vbuf;
 	ccb = req->ccb;
 	if (ccb == NULL) {
-		mpt_prt(mpt, "mpt_scsi_reply_handler: req %p:%u with no ccb\n",
+		mpt_lprt(mpt, MPT_PRT_DEBUG,
+		"mpt_scsi_reply_handler: req %p:%u with no ccb\n",
 		    req, req->serno);
 		return (TRUE);
 	}
@@ -2628,7 +2630,8 @@ mpt_scsi_reply_handler(struct mpt_softc *mpt, request_t *req,
 	if ((req->state & REQ_STATE_TIMEDOUT) == 0) {
 		TAILQ_REMOVE(&mpt->request_pending_list, req, links);
 	} else {
-		mpt_prt(mpt, "completing timedout/aborted req %p:%u\n",
+		mpt_lprt(mpt, MPT_PRT_DEBUG,
+		"completing timedout/aborted req %p:%u\n",
 		    req, req->serno);
 		TAILQ_REMOVE(&mpt->request_timeout_list, req, links);
 	}
@@ -3988,7 +3991,8 @@ mpt_recover_commands(struct mpt_softc *mpt)
 		uint8_t response;
 		MSG_REQUEST_HEADER *hdrp = req->req_vbuf;
 
-		mpt_prt(mpt, "attempting to abort req %p:%u function %x\n",
+		mpt_lprt(mpt, MPT_PRT_DEBUG,
+		"attempting to abort req %p:%u function %x\n",
 		    req, req->serno, hdrp->Function);
 		ccb = req->ccb;
 		if (ccb == NULL) {
@@ -4063,7 +4067,8 @@ mpt_recover_commands(struct mpt_softc *mpt)
 			mpt_reset(mpt, TRUE);
 			continue;
 		}
-		mpt_prt(mpt, "abort of req %p:%u completed\n", req, req->serno);
+		mpt_lprt(mpt, MPT_PRT_DEBUG,
+		"abort of req %p:%u completed\n", req, req->serno);
 	}
 }
 
diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c
index 8e8cb0cf413a..f2441c78c660 100644
--- a/sys/dev/mpt/mpt_debug.c
+++ b/sys/dev/mpt/mpt_debug.c
@@ -75,7 +75,7 @@
 
 #include <cam/scsi/scsi_all.h>
 
-#include <machine/stdarg.h>	/* for use by mpt_prt below */
+#include <sys/stdarg.h>	/* for use by mpt_prt below */
 
 struct Error_Map {
 	int 	 Error_Code;
diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c
index d4761c0fef67..5ff08ffcf2b3 100644
--- a/sys/dev/mpt/mpt_raid.c
+++ b/sys/dev/mpt/mpt_raid.c
@@ -57,10 +57,9 @@
 
 #include <sys/callout.h>
 #include <sys/kthread.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 
-#include <machine/stdarg.h>
-
 struct mpt_raid_action_result
 {
 	union {