git: ec7b47fc81b2 - main - pf: Move provider declaration to pf.h

[Kristof Provost]

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=ec7b47fc81b22470fb177d9e03b5a76818eee65f

commit ec7b47fc81b22470fb177d9e03b5a76818eee65f
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-05-31 16:34:37 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-06-01 07:02:05 +0000

    pf: Move provider declaration to pf.h
    
    This simplifies life a bit, by not requiring us to repease the
    declaration for every file where we want static probe points.
    
    It also makes the gcc6 build happy.
---
 sys/net/pfvar.h           | 3 +++
 sys/netpfil/pf/pf_ioctl.c | 1 -
 sys/netpfil/pf/pf_nv.h    | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 2202421086d2..73de877847e6 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -42,6 +42,7 @@
 #include <sys/malloc.h>
 #include <sys/nv.h>
 #include <sys/refcount.h>
+#include <sys/sdt.h>
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/rmlock.h>
@@ -60,6 +61,8 @@
 SYSCTL_DECL(_net_pf);
 MALLOC_DECLARE(M_PFHASH);
 
+SDT_PROVIDER_DECLARE(pf);
+
 struct pfi_dynaddr {
 	TAILQ_ENTRY(pfi_dynaddr)	 entry;
 	struct pf_addr			 pfid_addr4;
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 2d379d66486e..42c22ef9b894 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <net/altq/altq.h>
 #endif
 
-SDT_PROVIDER_DECLARE(pf);
 SDT_PROBE_DEFINE3(pf, ioctl, ioctl, error, "int", "int", "int");
 SDT_PROBE_DEFINE3(pf, ioctl, function, error, "char *", "int", "int");
 SDT_PROBE_DEFINE2(pf, ioctl, addrule, error, "int", "int");
diff --git a/sys/netpfil/pf/pf_nv.h b/sys/netpfil/pf/pf_nv.h
index e53d19018ffe..9e7bd7c3627e 100644
--- a/sys/netpfil/pf/pf_nv.h
+++ b/sys/netpfil/pf/pf_nv.h
@@ -37,7 +37,6 @@
 #include <net/if_var.h>
 #include <net/pfvar.h>
 
-SDT_PROVIDER_DECLARE(pf);
 SDT_PROBE_DECLARE(pf, ioctl, function, error);
 SDT_PROBE_DECLARE(pf, ioctl, nvchk, error);