svn commit: r249455 - stable/9/sys/dev/ciss

Sean Bruno sbruno at FreeBSD.org
Sun Apr 14 00:20:33 UTC 2013


Author: sbruno
Date: Sun Apr 14 00:20:32 2013
New Revision: 249455
URL: http://svnweb.freebsd.org/changeset/base/249455

Log:
  MFC r248824 & r248826
  
  Fix compile with CISS_DEBUG defined
  
  Fix DDB hook to actually work again

Modified:
  stable/9/sys/dev/ciss/ciss.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ciss/ciss.c
==============================================================================
--- stable/9/sys/dev/ciss/ciss.c	Sat Apr 13 22:45:41 2013	(r249454)
+++ stable/9/sys/dev/ciss/ciss.c	Sun Apr 14 00:20:32 2013	(r249455)
@@ -1868,7 +1868,7 @@ ciss_accept_media(struct ciss_softc *sc,
 
     ldrive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun);
 
-    debug(0, "bringing logical drive %d back online");
+    debug(0, "bringing logical drive %d back online", ldrive);
 
     /*
      * Build a CISS BMIC command to bring the drive back online.
@@ -4307,6 +4307,9 @@ ciss_print_ldrive(struct ciss_softc *sc,
 }
 
 #ifdef CISS_DEBUG
+#include "opt_ddb.h"
+#ifdef DDB
+#include <ddb/ddb.h>
 /************************************************************************
  * Print information about the controller/driver.
  */
@@ -4341,8 +4344,7 @@ ciss_print_adapter(struct ciss_softc *sc
 }
 
 /* DDB hook */
-static void
-ciss_print0(void)
+DB_COMMAND(ciss_prt, db_ciss_prt)
 {
     struct ciss_softc	*sc;
 
@@ -4354,6 +4356,7 @@ ciss_print0(void)
     }
 }
 #endif
+#endif
 
 /************************************************************************
  * Return a name for a logical drive status value.


More information about the svn-src-stable-9 mailing list