Module Name: src
Committed By: pgoyette
Date: Fri Sep 16 03:10:45 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/sys/kern: files.kern
src/sys/modules/dtrace/fbt: Makefile
src/sys/net: files.net
src/sys/sys: param.h
Log Message:
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 !
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/files.kern
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/fbt/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/net/files.net
cvs rdiff -u -r1.503 -r1.504 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.19 src/external/cddl/osnet/dev/fbt/fbt.c:1.20
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.19 Sun Jul 17 02:09:10 2016
+++ src/external/cddl/osnet/dev/fbt/fbt.c Fri Sep 16 03:10:45 2016
@@ -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 @@ fbt_open(dev_t dev, int flags, int mode,
return (0);
}
-MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace");
+MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace,zlib");
Index: src/sys/kern/files.kern
diff -u src/sys/kern/files.kern:1.11 src/sys/kern/files.kern:1.12
--- src/sys/kern/files.kern:1.11 Sat Apr 9 06:21:16 2016
+++ src/sys/kern/files.kern Fri Sep 16 03:10:45 2016
@@ -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_clock.c kern
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
Index: src/sys/modules/dtrace/fbt/Makefile
diff -u src/sys/modules/dtrace/fbt/Makefile:1.5 src/sys/modules/dtrace/fbt/Makefile:1.6
--- src/sys/modules/dtrace/fbt/Makefile:1.5 Thu Sep 18 19:45:24 2014
+++ src/sys/modules/dtrace/fbt/Makefile Fri Sep 16 03:10:45 2016
@@ -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
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.10 src/sys/net/files.net:1.11
--- src/sys/net/files.net:1.10 Wed Aug 10 05:56:30 2016
+++ src/sys/net/files.net Fri Sep 16 03:10:45 2016
@@ -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/route.c net
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
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.503 src/sys/sys/param.h:1.504
--- src/sys/sys/param.h:1.503 Tue Sep 13 07:41:18 2016
+++ src/sys/sys/param.h Fri Sep 16 03:10:45 2016
@@ -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__)
