From owner-svn-src-head@freebsd.org Wed May 8 18:10:20 2019 Return-Path: Delivered-To: svn-src-head@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 48C8A158F6A1; Wed, 8 May 2019 18:10:20 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DFB4A8789D; Wed, 8 May 2019 18:10:19 +0000 (UTC) (envelope-from mmacy@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 C0AB195CE; Wed, 8 May 2019 18:10:19 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x48IAJJ8090128; Wed, 8 May 2019 18:10:19 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x48IAJws090127; Wed, 8 May 2019 18:10:19 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201905081810.x48IAJws090127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Wed, 8 May 2019 18:10:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347357 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 347357 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DFB4A8789D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 May 2019 18:10:20 -0000 Author: mmacy Date: Wed May 8 18:10:19 2019 New Revision: 347357 URL: https://svnweb.freebsd.org/changeset/base/347357 Log: Enable sys/disk.h consumers to avoid pulling in networking headers. The networking headers break ZoF. Modified: head/sys/sys/disk.h Modified: head/sys/sys/disk.h ============================================================================== --- head/sys/sys/disk.h Wed May 8 17:46:59 2019 (r347356) +++ head/sys/sys/disk.h Wed May 8 18:10:19 2019 (r347357) @@ -21,9 +21,6 @@ #include #include -#include -#include - #ifdef _KERNEL #ifndef _SYS_CONF_H_ @@ -158,6 +155,10 @@ struct diocskerneldump_arg_freebsd12 { #define DIOCSKERNELDUMP_FREEBSD12 \ _IOW('d', 144, struct diocskerneldump_arg_freebsd12) +#ifndef WITHOUT_NETDUMP +#include +#include + union kd_ip { struct in_addr in4; struct in6_addr in6; @@ -208,5 +209,6 @@ _Static_assert(__offsetof(struct diocskerneldump_arg, /* * Get current kernel netdump configuration details for a given index. */ +#endif #endif /* _SYS_DISK_H_ */