From owner-svn-src-stable@freebsd.org  Tue Jan 17 23:55:11 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8CE3BCB577E;
 Tue, 17 Jan 2017 23:55:11 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5B9AC11C2;
 Tue, 17 Jan 2017 23:55:11 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HNtAHV015523;
 Tue, 17 Jan 2017 23:55:10 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HNtA4H015522;
 Tue, 17 Jan 2017 23:55:10 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701172355.v0HNtA4H015522@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Tue, 17 Jan 2017 23:55:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r312357 - in stable/10/sys: cam/scsi modules/cam
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2017 23:55:11 -0000

Author: ngie
Date: Tue Jan 17 23:55:10 2017
New Revision: 312357
URL: https://svnweb.freebsd.org/changeset/base/312357

Log:
  MFC r299864,r303166:
  
  r299864 (by markj):
  
  opt_kdtrace.h is not needed for SDT probes as of r258541.
  
  r303166 (by imp):
  
  Add opt_ddb.h.

Modified:
  stable/10/sys/cam/scsi/scsi_pass.c
  stable/10/sys/modules/cam/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/scsi/scsi_pass.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_pass.c	Tue Jan 17 23:47:37 2017	(r312356)
+++ stable/10/sys/cam/scsi/scsi_pass.c	Tue Jan 17 23:55:10 2017	(r312357)
@@ -28,8 +28,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

Modified: stable/10/sys/modules/cam/Makefile
==============================================================================
--- stable/10/sys/modules/cam/Makefile	Tue Jan 17 23:47:37 2017	(r312356)
+++ stable/10/sys/modules/cam/Makefile	Tue Jan 17 23:55:10 2017	(r312357)
@@ -14,6 +14,7 @@ SRCS+=	opt_cd.h
 SRCS+=	opt_pt.h
 SRCS+=	opt_sa.h
 SRCS+=	opt_ses.h
+SRCS+=	opt_ddb.h
 SRCS+=	device_if.h bus_if.h vnode_if.h
 SRCS+=	cam.c
 SRCS+=	cam_compat.c