[src/trunk]: src Move kern_ctf.c into the dtrace_fbt module (the only place i...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7add029b070c
branches:  trunk
changeset: 347770:7add029b070c
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri Sep 16 03:10:45 2016 +0000

description:
Move kern_ctf.c into the dtrace_fbt module (the only place it is used)
rather than including in kernels with KDTRACE_HOOKS defined.  Update
the dtrace_fbt module to depend on the zlib module.

Bump kernel version to avoid module mismatch.

Welcome to 7.99.38 !

diffstat:

 external/cddl/osnet/dev/fbt/fbt.c |  4 ++--
 sys/kern/files.kern               |  7 +++++--
 sys/modules/dtrace/fbt/Makefile   |  6 +++++-
 sys/net/files.net                 |  4 ++--
 sys/sys/param.h                   |  4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diffs (88 lines):

diff -r d9c09436ef41 -r 7add029b070c external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Fri Sep 16 00:50:43 2016 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Fri Sep 16 03:10:45 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbt.c,v 1.19 2016/07/17 02:09:10 pgoyette Exp $        */
+/*     $NetBSD: fbt.c,v 1.20 2016/09/16 03:10:45 pgoyette Exp $        */
 
 /*
  * CDDL HEADER START
@@ -2141,4 +2141,4 @@
        return (0);
 }
 
-MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace");
+MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace,zlib");
diff -r d9c09436ef41 -r 7add029b070c sys/kern/files.kern
--- a/sys/kern/files.kern       Fri Sep 16 00:50:43 2016 +0000
+++ b/sys/kern/files.kern       Fri Sep 16 03:10:45 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.kern,v 1.11 2016/04/09 06:21:16 riastradh Exp $
+#      $NetBSD: files.kern,v 1.12 2016/09/16 03:10:45 pgoyette Exp $
 
 #
 # kernel sources
@@ -33,7 +33,10 @@
 file   kern/kern_condvar.c             kern
 file   kern/kern_core.c                coredump
 file   kern/kern_cpu.c                 kern
-file   kern/kern_ctf.c                 kdtrace_hooks
+
+#kern/kern_ctf.c is only needed as part of dtrace_fbt module
+#file  kern/kern_ctf.c                 kdtrace_hooks
+
 file   kern/kern_descrip.c             kern
 file   kern/kern_event.c               kern
 file   kern/kern_exec.c                kern
diff -r d9c09436ef41 -r 7add029b070c sys/modules/dtrace/fbt/Makefile
--- a/sys/modules/dtrace/fbt/Makefile   Fri Sep 16 00:50:43 2016 +0000
+++ b/sys/modules/dtrace/fbt/Makefile   Fri Sep 16 03:10:45 2016 +0000
@@ -7,7 +7,11 @@
 KMOD=          dtrace_fbt
 SRCS=          fbt.c
 
-CPPFLAGS+=     -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
+.PATH: ${S}/kern
+
+SRCS+=         kern_ctf.c
+
+CPPFLAGS.fbt.c+=       -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
                -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common 
 
 CPPFLAGS+=     -Wno-unknown-pragmas
diff -r d9c09436ef41 -r 7add029b070c sys/net/files.net
--- a/sys/net/files.net Fri Sep 16 00:50:43 2016 +0000
+++ b/sys/net/files.net Fri Sep 16 03:10:45 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.net,v 1.10 2016/08/10 05:56:30 knakahara Exp $
+#      $NetBSD: files.net,v 1.11 2016/09/16 03:10:45 pgoyette Exp $
 
 # XXX CLEANUP
 define net
@@ -49,7 +49,7 @@
 file   net/rtbl.c                      net
 file   net/rtsock.c                    net
 file   net/slcompress.c                sl | ppp | strip | (irip & irip_vj)
-file   net/zlib.c                      (ppp & ppp_deflate) | swcrypto | vnd_compression | kdtrace_hooks
+file   net/zlib.c                      (ppp & ppp_deflate) | swcrypto | vnd_compression
 file   netinet/accf_data.c             accf_data
 file   netinet/accf_http.c             accf_http
 file   netinet/cpu_in_cksum.c          (inet | inet6) & !cpu_in_cksum
diff -r d9c09436ef41 -r 7add029b070c sys/sys/param.h
--- a/sys/sys/param.h   Fri Sep 16 00:50:43 2016 +0000
+++ b/sys/sys/param.h   Fri Sep 16 03:10:45 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.503 2016/09/13 07:41:18 martin Exp $       */
+/*     $NetBSD: param.h,v 1.504 2016/09/16 03:10:45 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *     2.99.9          (299000900)
  */
 
-#define        __NetBSD_Version__      799003700       /* NetBSD 7.99.37 */
+#define        __NetBSD_Version__      799003800       /* NetBSD 7.99.38 */
 
 #define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
     (m) * 1000000) + (p) * 100) <= __NetBSD_Version__)