From owner-svn-src-stable-9@FreeBSD.ORG  Sun Apr 14 00:20:33 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D1F108BA;
 Sun, 14 Apr 2013 00:20:33 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BF0EC1899;
 Sun, 14 Apr 2013 00:20:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3E0KXkF049608;
 Sun, 14 Apr 2013 00:20:33 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3E0KXaU049607;
 Sun, 14 Apr 2013 00:20:33 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201304140020.r3E0KXaU049607@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Sun, 14 Apr 2013 00:20:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r249455 - stable/9/sys/dev/ciss
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Apr 2013 00:20:33 -0000

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.