From owner-svn-src-all@freebsd.org Fri Apr 13 12:41:52 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C0EAF85B52;
Fri, 13 Apr 2018 12:41:52 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id D10F375A43;
Fri, 13 Apr 2018 12:41:51 +0000 (UTC) (envelope-from br@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC13919E5A;
Fri, 13 Apr 2018 12:41:51 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3DCfpEc019615;
Fri, 13 Apr 2018 12:41:51 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3DCfpa0019612;
Fri, 13 Apr 2018 12:41:51 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201804131241.w3DCfpa0019612@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Fri, 13 Apr 2018 12:41:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r332468 - head/sys/dev/xdma
X-SVN-Group: head
X-SVN-Commit-Author: br
X-SVN-Commit-Paths: head/sys/dev/xdma
X-SVN-Commit-Revision: 332468
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2018 12:41:52 -0000
Author: br
Date: Fri Apr 13 12:41:51 2018
New Revision: 332468
URL: https://svnweb.freebsd.org/changeset/base/332468
Log:
Don't include sys/bus_dma.h directly, use machine/bus.h instead.
Sponsored by: DARPA, AFRL
Modified:
head/sys/dev/xdma/xdma_queue.c
head/sys/dev/xdma/xdma_sg.c
head/sys/dev/xdma/xdma_sglist.c
Modified: head/sys/dev/xdma/xdma_queue.c
==============================================================================
--- head/sys/dev/xdma/xdma_queue.c Fri Apr 13 10:03:30 2018 (r332467)
+++ head/sys/dev/xdma/xdma_queue.c Fri Apr 13 12:41:51 2018 (r332468)
@@ -37,8 +37,9 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/bus_dma.h>
#include <sys/sx.h>
+
+#include <machine/bus.h>
#include <dev/xdma/xdma.h>
Modified: head/sys/dev/xdma/xdma_sg.c
==============================================================================
--- head/sys/dev/xdma/xdma_sg.c Fri Apr 13 10:03:30 2018 (r332467)
+++ head/sys/dev/xdma/xdma_sg.c Fri Apr 13 12:41:51 2018 (r332468)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/bus_dma.h>
#include <sys/sx.h>
#include <machine/bus.h>
Modified: head/sys/dev/xdma/xdma_sglist.c
==============================================================================
--- head/sys/dev/xdma/xdma_sglist.c Fri Apr 13 10:03:30 2018 (r332467)
+++ head/sys/dev/xdma/xdma_sglist.c Fri Apr 13 12:41:51 2018 (r332468)
@@ -37,7 +37,8 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/bus_dma.h>
+
+#include <machine/bus.h>
#include <dev/xdma/xdma.h>