From owner-svn-src-projects@FreeBSD.ORG  Sun Jan  9 09:56:43 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F76F106564A;
	Sun,  9 Jan 2011 09:56:43 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F4508FC17;
	Sun,  9 Jan 2011 09:56:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p099uhUG037406;
	Sun, 9 Jan 2011 09:56:43 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p099uhS3037404;
	Sun, 9 Jan 2011 09:56:43 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201101090956.p099uhS3037404@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 9 Jan 2011 09:56:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217188 - projects/graid/head/sys/cam/ata
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Jan 2011 09:56:43 -0000

Author: mav
Date: Sun Jan  9 09:56:43 2011
New Revision: 217188
URL: http://svn.freebsd.org/changeset/base/217188

Log:
  Fix panic when built without ADA_TEST_FAILURE.

Modified:
  projects/graid/head/sys/cam/ata/ata_da.c

Modified: projects/graid/head/sys/cam/ata/ata_da.c
==============================================================================
--- projects/graid/head/sys/cam/ata/ata_da.c	Sun Jan  9 09:21:11 2011	(r217187)
+++ projects/graid/head/sys/cam/ata/ata_da.c	Sun Jan  9 09:56:43 2011	(r217188)
@@ -855,12 +855,14 @@ adaregister(struct cam_periph *periph, v
 		dp->secsize, dp->heads,
 		dp->secs_per_track, dp->cylinders);
 	xpt_announce_periph(periph, announce_buf);
+#ifdef ADA_TEST_FAILURE
 	/*
 	 * Create our sysctl variables, now that we know
 	 * we have successfully attached.
 	 * XXX: da code does a cam_periph_acquire(periph) here -- why?.
 	 */
 	taskqueue_enqueue(taskqueue_thread, &softc->sysctl_task);
+#endif
 	/*
 	 * Add async callbacks for bus reset and
 	 * bus device reset calls.  I don't bother